From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3639EC47083 for ; Wed, 2 Jun 2021 17:40:38 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0961B61D6F for ; Wed, 2 Jun 2021 17:40:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0961B61D6F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5C7282EE5; Wed, 2 Jun 2021 19:40:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="G7I1G9Kx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2507A82EF0; Wed, 2 Jun 2021 19:40:33 +0200 (CEST) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6560582ECA for ; Wed, 2 Jun 2021 19:40:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1622655626; bh=VMFTgJp03JSflg9atarKzm2ppnOvB2IDjPWdya/NrEc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=G7I1G9Kx+EljcAQfC3bDMyjynLTJhNsy+0lAJasMByI8qjr/fnNfwiX79TS0GRWex K7cNhiJ0LEjYWYLVnKYIWhxF5s6wCSfUo7C9gDfLWtrTV0g5knxBfB2ylUsczDxVJp 9M3j44oC4Syr96kQBETpHG+oWYO8BfujWqo5SQX0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.247.63]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MhD6W-1lAE5g2j7y-00eLKx; Wed, 02 Jun 2021 19:40:26 +0200 From: Heinrich Schuchardt To: AKASHI Takahiro , Sughosh Ganu Cc: Alexander Graf , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] efi_loader: efi_capsule_delete_file() NULL dereference Date: Wed, 2 Jun 2021 19:40:19 +0200 Message-Id: <20210602174019.24906-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:eFGs0oFmqeHKbqaoTiuYSVfAOv3wTAlGiQkXuC45gR1DX0GDj0E FKThg8G+LKmdZDf+XRFm9F6bZgtQAmRjTYNmh8cN2r2ixfP01tADPXfC2TAZQOBtQnNWw9p ROXSak/bIpdCfG4jtf7sT+6q5Ia44/pOzWmnBSrK4DIZW8ULm/gI+H6ZWmG1k1NmaeHpYr2 qq89hCVg01ZwUvElghSnQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:xb0BZCWW/KM=:UNng3AKUksfvQ0Z7QWag5s +5f2I8wMznKPRci9hsz3b9HffnP3jABWL7i1bv/scsOMDssFUL2cH4XsPnLf319kOqms7jiQy WqII2fTAwfvIW+Y1amjJ1l/aLMEc//fEGUR1E7D8FBpVY6HsSasnqAftyC/krzQXABe0G57TX r3W1v0h88zdnYgOXRIBdlgQlBgmMDNWgYclF8BQKhh7Ha3QTWTByP6hUMWpanzxVRv1L04zyO GUsj302dvplBgBjEuzSerIBMfn/ZIWAD3c1Jqt0uWaf2Rw8dNhjDzgxHZTIEuazSt1s+Us1Fe TZG57Dymsml8wa5pdDLprpLv2r/yPPk34o1R0oWXNgoYcZF/c8/UDGfOX9IxgbwIlLqSWgMHi 6U0zjKI9IKm3aZwhj/IhKuHSLV1y3eo9RPdRdER97/6TZPhw2DoTkON+y2bpfQ1EIKqqWVzw7 qyRxcvHKCgUdsyJfqbdhwUg1dTCfuyOMSgDFm3piVlxyobL8hGsaNfA1b/kRDcBF4AnMHQNhN 9T+yKdxn6LM14+sxRTED7ugL9J1fVC54LpGp/E2w8QLdMoAriFomwbO4udoAEV9BGOUoFqN3G 47Na0EZzdIf2Va3iTssa272hI9EurldpiUKXQqAZakdguwRwlAMg8hdGyVeBa0ZAb1SIdWaL1 EHu6xr/d3Cbu44+z2alPZ64CdLbcbJoG46moQFzxYOkZ2sOdgZJ/fwWPbgDHqagZGldo2bnJS fgLbCbSpenG7OgCqdvC5zlMn+QMjWrVYA9KR/oTuHOuO7OpWhEFEq9LPLevnw0NdzxUtHiT/K U0M35tZeRC95MGB8jTZhyxslP1KzTyh6MQZ0MJqwqvd67JSRD6QJUsRYn4JmAl5sTTVwNzLh0 hNrz1SAkJ8tXv6ya3Ch1zL3+tCvuSct2qRH7eZOt7sEr8D0yEp1RE1mawvW/TNQ4/3KShvJ5b jtSIe5qkSGxuzNKAkwu7+eMnUvcx7fef/Ahj+mrQau1AqpxYc/oY1EqYhUDNZJyzL7XMNwwLH +AgB9Y+VMgfmRwevbBYGhHd9eioVTDu0Ws3IfhwDPRy2g20KCA9IsV3Y7NnwVB1aLvgxIdNgj mCzaCEBL1AA6zYKo0K0SPbWZD4y8+hKpF2a X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean If opening a file fails, the file handle pointer is not valid and must not be dereferenced. Signed-off-by: Heinrich Schuchardt =2D-- lib/efi_loader/efi_capsule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 9ead0d2c78..60309d4a07 100644 =2D-- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -901,7 +901,8 @@ static efi_status_t efi_capsule_delete_file(const u16 = *filename) /* ignore an error */ EFI_CALL((*dirh->close)(dirh)); - ret =3D EFI_CALL((*fh->delete)(fh)); + if (ret =3D=3D EFI_SUCCESS) + ret =3D EFI_CALL((*fh->delete)(fh)); return ret; } =2D- 2.30.2