From patchwork Fri Jun 22 08:38:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 933152 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dblcfy3q"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41BsNM6R76z9s4V for ; Fri, 22 Jun 2018 18:36:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 95463C21C2F; Fri, 22 Jun 2018 08:35:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E52A9C2201B; Fri, 22 Jun 2018 08:34:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4A680C21E7E; Fri, 22 Jun 2018 08:33:53 +0000 (UTC) Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by lists.denx.de (Postfix) with ESMTPS id 57576C21FC1 for ; Fri, 22 Jun 2018 08:33:49 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id 31-v6so3142593plc.4 for ; Fri, 22 Jun 2018 01:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0MwhPLf0l79HXTcZdYSYHt6zRPXnGIhXdC6g9/kZJOU=; b=dblcfy3qOK2yN1fMdvE8xA51p1QQqxTxOWKZ1hh49IA/M/tt7N5Glu1dxX4HWbeNDm pFPOYbGZpTvwU3o+78nDMv5jsCHZAXcauJX6Qr7LK61EcnXrPOJVHbQEou79Uo+9yybd TLgNJcjIhbwO9PtLOwt7xvQ1bzSu2v6T6csB8LE2r+Ge8dczqZKNB23P3CmM4CUg9sUK EkixPYq6LOF3niWuE0OyKBooycJbWO+8yO4q4EkeAXGTJfG84/WwTpCn5ZGcjKyacZwi 48OUYoDJmtdUofP/5ePwkZ8xsZoPVg4L9mCRxoLdf6a4NINHSMRMovvYqEKtt15vrmVh pdgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0MwhPLf0l79HXTcZdYSYHt6zRPXnGIhXdC6g9/kZJOU=; b=DAuWLA+9oUdEZleX3dbIOfn1bP7hi5ZzlOGCw50/HaBzc9X281BMtszdww9h12FyAj 7HmoEU9Lror5mxPXpJNmds0dgBE17pJ/6ITtHRDvXuzyy82KrdwI1Ew+Tric1m8j26sn GO8qMfvinOkMxhn+zAKdXKQZ3yxVlqwBKblfsnSQCokq2S8OJSyGlMLBaZd+Uz8CfPR8 LsamY0FZJT7au6kgciansCqRSbTSkhyZ1O/7F+kHXd0nUwSMDR5YkX8/Mtve2xjvStLz Ae2gsPJfYR8OrxdOlogXytyREX1gtZinNlQ1lIt66POJVcLPtawCa68LlEXeN3I5fP6A YzUg== X-Gm-Message-State: APt69E1mmbeTFkYnTMsZQ7YOyjtkeDZm4SmX+f0xHBaV+nGmVJxP+EST 5FCtjE37sxBbc4QBKAjun3U= X-Google-Smtp-Source: ADUXVKKJJOzTl7Hz/niAoTmGoQL1CsSzAb4haZlYl2WCnDEcngRk++9cqgU4s0N58lqrdeq9+dGgQQ== X-Received: by 2002:a17:902:6b0b:: with SMTP id o11-v6mr687006plk.101.1529656428125; Fri, 22 Jun 2018 01:33:48 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id y11-v6sm10219474pfn.92.2018.06.22.01.33.46 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Jun 2018 01:33:47 -0700 (PDT) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Fri, 22 Jun 2018 01:38:31 -0700 Message-Id: <1529656712-3660-7-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1529656712-3660-1-git-send-email-bmeng.cn@gmail.com> References: <1529656712-3660-1-git-send-email-bmeng.cn@gmail.com> Cc: Bin Meng Subject: [U-Boot] [PATCH 6/6] cmd: efi: Fix wrong memory descriptor end address X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Each entry of the EFI memory descriptors occupies map->desc_size, not sizeof(struct efi_mem_desc). Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- cmd/efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/efi.c b/cmd/efi.c index 2511c6c..6c1eb88 100644 --- a/cmd/efi.c +++ b/cmd/efi.c @@ -83,7 +83,7 @@ void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs) prev = NULL; addr = 0; dest = base; - end = base + count; + end = (struct efi_mem_desc *)((ulong)base + count * map->desc_size); for (desc = base; desc < end; desc = efi_get_next_mem_desc(map, desc)) { bool merge = true; int type = desc->type;