From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 10 Oct 2022 08:12:54 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ohm22-0033eI-R4 for lore@lore.pengutronix.de; Mon, 10 Oct 2022 08:12:54 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ohm20-00018c-N2 for lore@pengutronix.de; Mon, 10 Oct 2022 08:12:53 +0200 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=LOvp2PwB/ANhJZ99Cc6Cl/QZSejAsbjL3Bxh0z2XWqU=; b=L8LqBMz+Ssf5oaw8yLxc1NelFW 1cMi0JuZLQDA04oGWzqeyIHJ3cWulldSdg76ifg1fNj+kVnCeBBCVLkeSB/LHQImvZck+8K2alOdH tQ/G09DzgcFoYqqD/WguhX27zYZ4mjaYOfFjFalUHU6KQiMmAthoQ7I3WZowAVl6HGtuXa58pRtt4 bqJP6utD/HuplJQ25C8+j+mKNXC/CI/fifaq6n1S/VNlLBc7Y/8Q/fyqkqYEfuvGKhqVvIyYqQlEH 6+5nv7pAI3+E8Ur25vTsFKYYP39OACDDyqjWRsemgpK3PE+nckWLuf/aCrKidcFzn5G7eZ4Li629n 6QOOrJHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ohm0o-00HAbq-Lf; Mon, 10 Oct 2022 06:11:38 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ohm0e-00HAWh-3y for barebox@lists.infradead.org; Mon, 10 Oct 2022 06:11:30 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ohm0c-0000Yg-SY; Mon, 10 Oct 2022 08:11:26 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ohm0c-000dA5-5y; Mon, 10 Oct 2022 08:11:26 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ohm0a-008kAq-5F; Mon, 10 Oct 2022 08:11:24 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 10 Oct 2022 08:11:16 +0200 Message-Id: <20221010061122.2084009-5-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221010061122.2084009-1-a.fatoum@pengutronix.de> References: <20221010061122.2084009-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-20221009_231128_170156_E2454A2A X-CRM114-Status: UNSURE ( 9.29 ) 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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.5 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 autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 04/10] driver: don't crash when dev_name/dev_id is called with NULL dev X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) cdev->dev being NULL is normal for virtual device files like /dev/null, but can trip developers over. Ensure dev_name(cdev->dev) returns NULL instead of crashing for more robustness. Signed-off-by: Ahmad Fatoum --- include/driver.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/driver.h b/include/driver.h index 543287a27638..c81aa8587c13 100644 --- a/include/driver.h +++ b/include/driver.h @@ -184,6 +184,8 @@ char *deviceid_from_spec_str(const char *str, char **endp); static inline const char *dev_id(const struct device_d *dev) { + if (!dev) + return NULL; return (dev->id != DEVICE_ID_SINGLE) ? dev->unique_name : dev->name; } -- 2.30.2