From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 16 Feb 2026 09:43:39 +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 1vruCg-002GBP-1Q for lore@lore.pengutronix.de; Mon, 16 Feb 2026 09:43:39 +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 1vruCg-0001h0-Cb for lore@pengutronix.de; Mon, 16 Feb 2026 09:43:39 +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=LOhMAiNzkYztPv6pYIbnUK1qdAG7W86SKEjtXawzr+w=; b=rdlKgC4jekTvaLB+JV4xbIb1SA ASn95WewM7Il5lH4YyJomOcoU4LlB++OqjLg668Jouw1r5MUmP3VonQLOnkC+Jvwc82DrcHSWQmje n2MkZH2323n8ZEEoZXVRw2gbefIA7bPlHmtgNjRrY/fo3uUVc0f/GLcGrVJChINI26VEuvx3Ca3HZ QMuo7ErsexzU2Mm2x+h69mNfI5HPJdkXmO0A8/jQLjJ4oo5S39DCPBJ1ub+OllcmF67nGJ89ud7hz XTKboMxSkcFz0MSshvQMJc0zS/zLQJ5bV0+7aZCz5N3zH2MqcDIVwP43tYw5WBLwgevwO77ZvY5Pn uGvZdHow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vruCJ-00000006B2V-1LQc; Mon, 16 Feb 2026 08:43:15 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vruCG-00000006Azt-203K for barebox@lists.infradead.org; Mon, 16 Feb 2026 08:43:13 +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 1vruBy-00011l-I5; Mon, 16 Feb 2026 09:42:54 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vruBw-0012C1-2n; Mon, 16 Feb 2026 09:42:54 +0100 Received: from [::1] (helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1vruBy-0000000Esrv-0Qcw; Mon, 16 Feb 2026 09:42:54 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum , "Claude Opus 4.6" Date: Mon, 16 Feb 2026 09:42:22 +0100 Message-ID: <20260216084253.3547270-6-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260216084253.3547270-1-a.fatoum@pengutronix.de> References: <20260216084253.3547270-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-20260216_004312_518896_B8107187 X-CRM114-Status: UNSURE ( 9.26 ) X-CRM114-Notice: Please train this message. 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=-4.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 06/12] bootm: android: fix double close of fd 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) On the success path, close(fd) is called before bootm_boot(), then execution falls through to the err_close label which calls close(fd) again. Add an err_unlink label and jump past err_close on the success path to avoid the double close. Fixes: 8edffb6eef ("bootm: add generic android image handler") Reported-by: GCC 14.2 -fanalyzer Co-authored-by: Claude Opus 4.6 Signed-off-by: Ahmad Fatoum --- common/bootm-android-image.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/bootm-android-image.c b/common/bootm-android-image.c index 828400fef772..6acc41c3dd66 100644 --- a/common/bootm-android-image.c +++ b/common/bootm-android-image.c @@ -128,9 +128,11 @@ static int do_bootm_aimage(struct image_data *img_data) ret = bootm_boot(&bootm_data); + goto err_unlink; + err_close: close(fd); - +err_unlink: if (kernel) unlink(kernel); if (initrd) -- 2.47.3