From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Apr 2025 08:32:48 +0200 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 1u4DNA-000WxM-0K for lore@lore.pengutronix.de; Mon, 14 Apr 2025 08:32:48 +0200 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 1u4DN9-0001MM-H0 for lore@pengutronix.de; Mon, 14 Apr 2025 08:32:48 +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=GKIsKz0lm1BCLsag6lnerHtsA7K2h2xXtGye2mU4r0o=; b=gw2rFf+HNzlOG2zkOHVSPyxnDx 9IfjjU9vyqP3jTsIp4r4KHTZgXnW/JvqTSKiuYnn12jBRhmkO74+GxVi07mPqdqKktNLcF0KmzGo8 LPawDCfP63vSHLxaExSJR/LYURipnAWdNSdOKPg5/mKWdwyitglzmjxz/C0cdQmxKFhvJrEvY+pu5 3SkIavQPPVBRnMAh7RTFqt69vUBNfJOwcjm9oZ6aFHg21Y2WyZg18eP57vT6IlhOli2H5yr1rYlCg mLMODnbOhksuYX02MuKfvB9FjcJfmbEZqazGLVxej4qN5GdlELrZ1ZNurKFveHPD0Bz6Z4dMTkDva MXi1eUhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4DMi-00000000nvB-2tG8; Mon, 14 Apr 2025 06:32:20 +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 1u4DMJ-00000000npm-0lOT for barebox@lists.infradead.org; Mon, 14 Apr 2025 06:31:58 +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 1u4DMH-0000lb-VT; Mon, 14 Apr 2025 08:31:53 +0200 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 1u4DMH-000Chq-2Q; Mon, 14 Apr 2025 08:31:53 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1u4DMH-00BUi8-27; Mon, 14 Apr 2025 08:31:53 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 14 Apr 2025 08:31:42 +0200 Message-Id: <20250414063152.2736649-9-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414063152.2736649-1-a.fatoum@pengutronix.de> References: <20250414063152.2736649-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-20250413_233155_229941_26CBFE6D X-CRM114-Status: GOOD ( 10.48 ) 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=-5.2 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 08/18] cdev: do not dereference partname for non-partitions 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) Except for this one place, the rest of the code can deal with cdev links to non-partitions. Switch the function over to use streq_ptr, so we can use cdev master links without risking a NULL pointer dereference. Signed-off-by: Ahmad Fatoum --- fs/devfs-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/devfs-core.c b/fs/devfs-core.c index e32bce9e307e..04bf866a67e0 100644 --- a/fs/devfs-core.c +++ b/fs/devfs-core.c @@ -192,13 +192,11 @@ struct cdev *device_find_partition(struct device *dev, const char *name) list_for_each_entry(cdev, &dev->cdevs, devices_list) { struct cdev *cdevl; - if (!cdev->partname) - continue; - if (!strcmp(cdev->partname, name)) + if (streq_ptr(cdev->partname, name)) return cdev; list_for_each_entry(cdevl, &cdev->links, link_entry) { - if (!strcmp(cdevl->partname, name)) + if (streq_ptr(cdevl->partname, name)) return cdev_readlink(cdevl); } } -- 2.39.5