From patchwork Wed Jun 12 16:15:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1114684 X-Patchwork-Delegate: xypron.glpk@gmx.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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="TKWGpU6G"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45PBmz6wLSz9s4Y for ; Thu, 13 Jun 2019 02:15:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9A237C21F4D; Wed, 12 Jun 2019 16:15:45 +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, 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 5D749C21E6C; Wed, 12 Jun 2019 16:15:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 64380C21E6C; Wed, 12 Jun 2019 16:15:42 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lists.denx.de (Postfix) with ESMTPS id 180ADC21E56 for ; Wed, 12 Jun 2019 16:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1560356137; bh=RkzzxSM92A5q+DFVbutiCEdZUorKnn6yUnP9zdT7jE8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=TKWGpU6Gqj4MDvSASdasymA8XEiScfjvsS+UfPvRvlSYw5g2O/XqYRF16XaysgBqa 4hH4KShC2A4acYAfUXpzLzI5pMt1h0/zrWOiMNxB6BAWRcd6LdRSboaNQoMYTPs+Ac F8Bk2s6pggxOmNFgJifJyNmDKBiTawbBfJlvPArw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([84.118.159.3]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MCKBc-1hkPZD2094-009LoE; Wed, 12 Jun 2019 18:15:37 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Wed, 12 Jun 2019 18:15:22 +0200 Message-Id: <20190612161522.4349-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:HQzqw0aG/cyLASCUpCMCp4u/ns80lFaybEaLXBH5clzgtLfzJOK Mhv4Zgjc8cqSA9OgteCP0xZ3UxGQ639WJuwmObsRCXhHMPLAoyv7H2GZT2Iz3ty8K6DsGzz AZvx8s0wTOu+IFu+JfbMcvPE8sSlHl0Ams3SiI1dv45n/vrH/JVn6PJChMWAHyO2akJxJbQ QTC5PNygyFtnMGqUrbrDg== X-UI-Out-Filterresults: notjunk:1; V03:K0:eRCxBwuQIEY=:hH6eiuEKe7QWJHT8fD39mz BF0duZ/SnquLd2qn79lkWvFwjjl8OkxgyC2sB1JgP7826HZ6ZmcfVorSNt4oUH0uDgyk4u4H8 vZpvDREsX8wbPSDTjdBTrtt2AXNY7fJO/NOzbUgd7s2cR0JdRs5cZ2fKMfGEB2suq41iEHeDY wnLff60dfKoqGMXn1uIFS+bOw39N90d6pwX43ZW/GhWVj+ZjABmkDoAdqiCXidYCSYHgdcmO5 UAJY/n2oYhA2YpHCcieGeykbF8nW6vkfn/7tt8BUyJa+w6OtlK3oCnO9udUn/o1QnebqpwhCh ToJQxggAb1cidtONgFGV6bE29Gco6cGpwA6fIkcnMtNw/TpY9gRLJx7scKehqLdyQ7CIaMic9 mNCP6mJCea6Fr5VdIL8CfMM+VsCAsm32C1VIZZPPO23qkWKmHtFyLxzOhKH8dJwONH7TgHAzJ 8Yp3uEMnimxfrU8lpcUfj+daXazvhvmzlEKNCM6VqqS7VEFAnRsb8vJxJ0/Noatk3yJGq7o8A e2doyqDhkkhGA0deoWLFUEmV7l2w2ZUfylRT2BFLDbmfvrxAxJPMZUa7f/kcvR8ODCs7HGDFZ GqEjFG0Y9z0+5+1pnSDUJoYNTlNkvQ8iHqE97wigiT8CA9gftqGx+2H7yBl0jhxpcLw9mQCCN ayyJcuMfP5XmOGOR3CIW5VVf5UgjRFT2wqJjqhN9yhi/vHVudtRTn+a+h4OLVdOOtORe494ih 3XB8u2tUSTRaEMlnac/ufixwASnUSzP9agT7K6xa0eKle748NABUp2E6/MIIAuqRzanjldwaV Ga44Ti3OijnwCgBon9hSylWc5lZOGUa7su3B6hM2HBf3YnhJkIbwKkDSTWWb4dEVYOMw4lo0J lTXLmlpkV9Vgo4V+LL+GAOYmLaIxcuq8FVdA61+S/5THJ/yHTMwaEXKyQlsvF7FoZyTRnfUuW akNH9eHRyM1bn/7Q1zoMHNWd8CLEmZMleJ7FK3lRfccqkcQc5koeN Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] efi_loader: AllocatePages() must accept addr == 0 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" It must be possible to allocate memory at address 0 with AllocatePages(). Move a NULL pointer check. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 8d76851234..27379381e8 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -334,7 +334,6 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, * * Check that the address is within allocated memory: * - * * The address cannot be NULL. * * The address must be in a range of the memory map. * * The address may not point to EFI_CONVENTIONAL_MEMORY. * @@ -349,8 +348,6 @@ static efi_status_t efi_check_allocated(u64 addr, bool must_be_allocated) { struct efi_mem_list *item; - if (!addr) - return EFI_INVALID_PARAMETER; list_for_each_entry(item, &efi_mem, link) { u64 start = item->desc.physical_start; u64 end = start + (item->desc.num_pages << EFI_PAGE_SHIFT); @@ -560,6 +557,9 @@ efi_status_t efi_free_pool(void *buffer) efi_status_t ret; struct efi_pool_allocation *alloc; + if (!buffer) + return EFI_INVALID_PARAMETER; + ret = efi_check_allocated((uintptr_t)buffer, true); if (ret != EFI_SUCCESS) return ret;