public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20240306112558.163415-1-rand.sec96@gmail.com> (raw)
In-Reply-To: <170966495037.424347.1344425289163744212.kvalo@kernel.org>

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


  reply	other threads:[~2024-03-06 11:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-29  9:37 [PATCH] ssb: Fix potential NULL pointer dereference in ssb_device_uevent Rand Deeb
2024-02-29 13:40 ` Jonas Gorski
2024-02-29 18:08 ` Michael Büsch
2024-03-05 18:55 ` Kalle Valo
2024-03-06 11:25   ` Rand Deeb [this message]
2024-03-06 11:36     ` [PATCH v2] " Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240306112558.163415-1-rand.sec96@gmail.com \
    --to=rand.sec96@gmail.com \
    --cc=deeb.rand@confident.ru \
    --cc=kvalo@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=lvc-project@linuxtesting.org \
    --cc=m@bues.ch \
    --cc=voskresenski.stanislav@confident.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox