From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 03 Jan 2024 19:14:45 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rL5lO-002LvJ-0Q for lore@lore.pengutronix.de; Wed, 03 Jan 2024 19:14:45 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rL5lN-0005IV-3q for lore@pengutronix.de; Wed, 03 Jan 2024 19:14:45 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CLTJLVkx93NqUdbMSk14RyXeFOfNFPDWCRdxALpGntQ=; b=ekSGCQj98+QTp+3+dm3SZ37WCd /oCbEwSr+jradnkHrBzE5UXmBFem+SdabzVb4hF155z9pPhWagoWLvgbynchW4if/k4JOuZM/K6Ls FQxBTR/zUOCgyM8js7JHiSlD3LGF2PpOTBsFyclTLjRZylxMRY90UlwfHYTdzA4a2RrMgWZELtYv1 3XK2wzWs5SV6W2WVry6xIXJLJTc62QLe14X5DWS5l5wYxGShyhdO3PWiD6swFHST2qy/wFTnlZoTv E2zxonJy11817tYfMsSUmvvLgnzdnZNb7i3TtSiEsc2LDJx1okH3mbM48y1P9CgHhBIe9G3z2e80U 9mYno4Iw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rL5kG-00BdzI-2K; Wed, 03 Jan 2024 18:13:36 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rL5k3-00Bds7-03 for barebox@lists.infradead.org; Wed, 03 Jan 2024 18:13:33 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rL5k1-0004fq-Rd; Wed, 03 Jan 2024 19:13:21 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rL5k1-000Aq4-ET; Wed, 03 Jan 2024 19:13:21 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rL5k1-001j4X-1B; Wed, 03 Jan 2024 19:13:21 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Wed, 3 Jan 2024 19:11:29 +0100 Message-Id: <20240103181312.409668-10-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240103181312.409668-1-a.fatoum@pengutronix.de> References: <20240103181312.409668-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240103_101323_067273_F17356CE X-CRM114-Status: GOOD ( 10.91 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-6.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 009/112] efi: payload: image: return actual read_file() error X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) read_file returns NULL on error and sets errno, e.g. to ENOMEM if the image to be booted exceeds memory available to barebox. Yet, errno was ignored and EINVAL was returned as error code unconditionally. Fix this to improve user experience. Signed-off-by: Ahmad Fatoum --- efi/payload/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efi/payload/image.c b/efi/payload/image.c index 8e39098ae81b..8d29bf9bb434 100644 --- a/efi/payload/image.c +++ b/efi/payload/image.c @@ -86,7 +86,7 @@ static int efi_load_image(const char *file, efi_loaded_image_t **loaded_image, exe = read_file(file, &size); if (!exe) - return -EINVAL; + return -errno; efiret = BS->load_image(false, efi_parent_image, efi_device_path, exe, size, &handle); -- 2.39.2