From patchwork Fri Jul 21 17:04:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 792222 X-Patchwork-Delegate: agraf@suse.de 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xDcZT0jLBz9sNw for ; Sat, 22 Jul 2017 03:04:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8931FC21D7C; Fri, 21 Jul 2017 17:04:42 +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.7 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 6638BC21C4F; Fri, 21 Jul 2017 17:04:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E96C4C21C4F; Fri, 21 Jul 2017 17:04:39 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lists.denx.de (Postfix) with ESMTPS id 9C662C21C40 for ; Fri, 21 Jul 2017 17:04:39 +0000 (UTC) Received: from localhost.localdomain ([84.118.154.110]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MCOdh-1dQ2lT3AbR-009Cb6; Fri, 21 Jul 2017 19:04:38 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Fri, 21 Jul 2017 19:04:33 +0200 Message-Id: <20170721170433.1392-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.13.2 X-Provags-ID: V03:K0:WFkHEc6RJw593J+JUzUFndXdxQvQ9qTDDHkh6fFUW+CphuhyiZp CK1/oCquLKqs+M/BLEv6uN9v3XWYbbmHVq81nf+RcYA+RGtUlzuHp1Tny7Hq8NYcsMoFevI q5EL833DFb4AHLVS25xBueqNJ4Vgo9bvn+gJDqh6+Yp+AWqRAVigUUF3YNBNtPv1bSXIpY2 n45U+HAHb2doTGZW6vohw== X-UI-Out-Filterresults: notjunk:1; V01:K0:q+6lwo65F9w=:LMij6ec2/nVMf6loyopFgA NoAPWKQ8zQWFPjj8AjSJSUGFp5t4VS3yAnblM4AKBScxz0t72gBqQP+6PMi07VmdLx32hpZnX xSSnHzcK875AX0H8NzbrPqhgbqnaY09lpJEeyQ6x+JkOYBqQuwIuixV/Qcnxee7NUy1x9auml Mdh09GbRGXPVrWmEqtb74sM8pFpfPz8gOYGX2AKe/y90hHeBwG2wKCA/8mTbz87Whh4hMb/tr 3P8k2cocCri6Fz30Rzb/KhL7qAm7HwKp1iLLjbloAZ1Z66GM8/nzZVCwm1IXmlTGo/t07gJ7k uiCTT38RnJJWbmQihOVI6oA70xYP3XuAIAvLFWZ03EqknJkluSfFjT+Q50SWcnT7d8ZfRU+ut idnf3xJDIAd+DYDYNdC8Am+yXxbKk7tk4F3v3qbKSrid3atwIS32iLnY7hOzVTyibxodkCnEz YJkKKUue9J2D30MYONCXx9pmB5satqFJwbSBZAQLbeuZklFgaEuF/pcA5PQ+UB2zDlX+rQTvR 5WpOzy4rM2AQmhjbSDnIVyYqKnbGKmCC+9wxc3R00r4lcTltA5bdu5Q0CNA5D0joohVe3C+LT 1vhMd9urbionhWc3YlmjR9BaC//H3QQIa94FU2Oc8kQE040wnfLlktG+xVHx9bnYqRIoNA+HT wukwKghRo7MmSrt9iIyIvE8+nwSK2xShSo9mv/fWn8jMLh2cnd8s2NsmiNECftlFliNfSnvqb VDxKIMbYqjqKlU7Q6bpA6uLkRLn2hbi7lTS0E6NbOR5S1qF3aArIszg1RxNT1Mf6G5Nnr7XUB kA+CMHJ7RozJTTMuCEUwAOuR/OCRg== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] efi_memory: do parameter checks first 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" The parameter checks should be done first. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 5c53aaafdb..c56653f497 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -407,6 +407,9 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, map_size = map_entries * sizeof(struct efi_mem_desc); + if (provided_map_size < map_size) + return EFI_BUFFER_TOO_SMALL; + *memory_map_size = map_size; if (descriptor_size) @@ -415,9 +418,6 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, if (descriptor_version) *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION; - if (provided_map_size < map_size) - return EFI_BUFFER_TOO_SMALL; - /* Copy list into array */ if (memory_map) { /* Return the list in ascending order */