From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 16 Feb 2026 10:17:38 +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 1vrujZ-002Gt3-2P for lore@lore.pengutronix.de; Mon, 16 Feb 2026 10:17:38 +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 1vrujW-0007RC-6f for lore@pengutronix.de; Mon, 16 Feb 2026 10:17:38 +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=f1W/GGVrU4QO1SJWXmH8bXaG2Fud21AsMivG2FSrgXA=; b=L662fGZWiqgTIUoyFl35yRVY9o Ls0l1VO4SxW9tSuCEV63Kk/xUMeaB0IPPK/rhIoUWFwjJI1TTmZ8IYlN0Vtz1qGzQVmL2H6t1jK+7 plMEnKdVgqekJ3gEH8murM7PVAl0UCmRSM4fEo/E/bq/crhpHI+BYsQU3vmXKAah5wjqgj/DcFXIW rkDWcTgKdJM3RnT5MW+t5re9LS6STI9o2HZCzgZ9igXxRBzjQ2p1dne3uP8KSHe9gku2OX0MP6lMp AHQocZaOjwePVPJcdfZK3YcEfUDU+RYMPHmPmR4QvE/HKo3MTVyVbXUIELoIOsmpWE3zule4LdhaQ aacCl/iQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vruim-00000006EZW-2MhI; Mon, 16 Feb 2026 09:16:48 +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 1vruig-00000006ERo-2QNw for barebox@lists.infradead.org; Mon, 16 Feb 2026 09:16:44 +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 1vruif-0006Uf-0g; Mon, 16 Feb 2026 10:16:41 +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 1vruid-0012Wu-1D; Mon, 16 Feb 2026 10:16:40 +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 1vruH1-0000000Eudd-0kId; Mon, 16 Feb 2026 09:48:07 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 16 Feb 2026 09:44:32 +0100 Message-ID: <20260216084758.3548990-33-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260216084758.3548990-1-a.fatoum@pengutronix.de> References: <20260216084758.3548990-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_011642_642193_2899F05D X-CRM114-Status: GOOD ( 11.02 ) 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=-3.9 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 master 32/39] efi: payload: protect against missing state alias 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) of_find_node_by_alias() can return NULL if the "state" alias doesn't exist. The NULL result was passed directly to state_new_from_node(), causing a NULL pointer dereference. Add a NULL check with a warning message. Signed-off-by: Ahmad Fatoum --- efi/payload/init.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/efi/payload/init.c b/efi/payload/init.c index 03f831840de7..6d2bd046e4c2 100644 --- a/efi/payload/init.c +++ b/efi/payload/init.c @@ -306,7 +306,7 @@ static int efi_late_init(void) free(fdt); if (!IS_ERR(state_root)) { - struct device_node *np = NULL; + struct device_node *np; struct state *state; ret = barebox_register_of(state_root); @@ -314,6 +314,10 @@ static int efi_late_init(void) pr_warn("Failed to register device-tree: %pe\n", ERR_PTR(ret)); np = of_find_node_by_alias(state_root, "state"); + if (!np) { + pr_warn("No state alias in %s\n", state_desc); + return 0; + } state = state_new_from_node(np, false); if (IS_ERR(state)) -- 2.47.3