From patchwork Fri Jul 14 17:12:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 788658 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x8K5C0bD1z9t1y for ; Sat, 15 Jul 2017 03:13:01 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8973AC22021; Fri, 14 Jul 2017 17:12:52 +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 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 ADB37C21F1A; Fri, 14 Jul 2017 17:12:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D698AC21F1A; Fri, 14 Jul 2017 17:12:49 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lists.denx.de (Postfix) with ESMTPS id 509A9C21E61 for ; Fri, 14 Jul 2017 17:12:49 +0000 (UTC) Received: from localhost.localdomain ([88.152.145.149]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LsTDk-1dcPrD2Y5w-0123jO; Fri, 14 Jul 2017 19:12:47 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Fri, 14 Jul 2017 19:12:39 +0200 Message-Id: <20170714171239.1375-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K0:RngQVgDrUjaSfIN1bXf+gEKHPmhPMf/sCmwf9lMGYf8t3mgmxTz 8aCMzNl99zj/adiW/xOGo7zfq+f+eGPIRJGzjR1kkpUXNu/tfnImcFJGgeNupagH6M5oT5a o+6ONjhKyJo+1/Z6zeE9yvym0SM2+TjO1xD7GltTmHdjgbC6sjux/fGFYLqt579xNnAwGX+ 7AgjdH5oW5wnfDilcy2EA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Y4IHFQ+ZKBE=:PmP65zIgxFIAS83tZvTNt5 u47M7iKOMNkanfA3Umq6AbCrM5MarZkdpKIqMl/P7Ums9DnPlU+RDKLdxXFFnbabPbHnR2fPu 2Etnp6jeywW3l1Lxy8A9r2fgOK2WyfDKAGMQrTi/Laak+c3/V8+7xkTSOMKAMDmEt3+70SWlf G/WVbYan+Zn37eCp6nWRPMtCfJ69bpo1yOPoGzk1yG1mz1HqTovZb18JPSYaiZuk75tf6T+2D bFWQo7yuoCeMs4eNvlSgHcPl0iDnWPImPH7D9BGA//gwvpgUXjvbTWvd82RNMFE8vw6hYGqwJ 6m8/c3Gr7tlPW9mZd301IePEO9Kny3qIYs0DgMXQxeQc0lJPLTcxXcuoe3gZmC5S6S9GF1+IU 8o3AL3s2qpJeZLrfadCWDPuR9ADMi/ryB6a2tI/oUVcBmR7A9o3eiWp8yDogM1tx99i6Oy+4y xXa5H3SUSZqJJB+tCFvr7yS4GiT4n3cp8yzyL/aS2PyvRNIf/1n5/zPAzxj1Jr06HT6hohJvT uF1U8rwopB1YyG33LUx5oAGfpRlowjQLckASY2kCLxlq898LrAh9rEMxKA9rk962dxJR5Rum4 GJ1sbT75EiA4X7rCAQ2Sh/US/wDQR7/AtxuRU10NIMzVKG8VBXfoFWi3VFQcRkH+YMTkVGb9l P1RmT7MYkymtaxeLjsLFdevdc1NIBZrduSpyyQg8n/ke2jGJdQVgfBt+NOF4Y0jqjzO8udAC/ JQ2BTXx/BKFOuVCEKJnWG+YneNKa8n7tFcupgtbDgf99iFgvnMV//Vdojmn1PHmj2/3SuQY52 xccz6ROAkykKCn5ry5hAeN3kUti2Q== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] efi_memory: avoid NULL dereference in efi_free_pool 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" If efi_free_pool is called with argument NULL an illegal memory access occurs. So let's check the parameter on entry. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_memory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index db2ae19f59..5c53aaafdb 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -379,6 +379,9 @@ efi_status_t efi_free_pool(void *buffer) efi_status_t r; struct efi_pool_allocation *alloc; + if (buffer == NULL) + return EFI_INVALID_PARAMETER; + alloc = container_of(buffer, struct efi_pool_allocation, data); /* Sanity check, was the supplied address returned by allocate_pool */ assert(((uintptr_t)alloc & EFI_PAGE_MASK) == 0);