Received-SPF: pass (google.com: domain of linux-wireless+bounces-4429-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Rand Deeb <rand.sec96@gmail.com>
To: kvalo@kernel.org
Cc: deeb.rand@confident.ru,
	linux-kernel@vger.kernel.org,
	linux-wireless@vger.kernel.org,
	lvc-project@linuxtesting.org,
	m@bues.ch,
	rand.sec96@gmail.com,
	voskresenski.stanislav@confident.ru
Subject: [PATCH v2] ssb: Fix potential NULL pointer dereference in ssb_device_uevent
Date: Wed,  6 Mar 2024 14:25:58 +0300
Message-Id: <20240306112558.163415-1-rand.sec96@gmail.com>
In-Reply-To: <170966495037.424347.1344425289163744212.kvalo@kernel.org>
References: <170966495037.424347.1344425289163744212.kvalo@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Hi Kalle,

It seems there's been a mix-up in applying the patch. The previous patch
was intended for the linux-5.10.y branch, not the master branch. I
appreciate your attention to detail.

The following patch has been tailored for the master branch and should
resolve the issue properly. Thank you for your understanding.

Signed-off-by: Rand Deeb <rand.sec96@gmail.com>
---
 drivers/ssb/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index b9934b9c2d70..070a99a4180c 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -341,11 +341,13 @@ static int ssb_bus_match(struct device *dev, struct device_driver *drv)
 
 static int ssb_device_uevent(const struct device *dev, struct kobj_uevent_env *env)
 {
-	const struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
+	const struct ssb_device *ssb_dev;
 
 	if (!dev)
 		return -ENODEV;
 
+	ssb_dev = dev_to_ssb_dev(dev);
+
 	return add_uevent_var(env,
 			     "MODALIAS=ssb:v%04Xid%04Xrev%02X",
 			     ssb_dev->id.vendor, ssb_dev->id.coreid,
-- 
2.34.1