mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Johannes Berg <johannes@sipsolutions.net>,
	Johannes Berg <johannes.berg@intel.com>,
	linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-next@vger.kernel.org
Subject: [PATCH linux-next] wifi: nl80211: fix double wdev_put() from the wireless-next merge
Date: Tue, 10 Nov 2026 21:40:29 -0500	[thread overview]
Message-ID: <20261111024029.759859-1-sashal@kernel.org> (raw)
In-Reply-To: <avNx0gmZTCIjln1Y@sirena.org.uk>

The wireless tree has commit 5e25f6b1b18d ("wifi: nl80211: fix ERR_PTR
use on wdev disappearance"), which returns right away when
__nl80211_lock_held_wdev() fails. wireless-next changed the same lines
in commit a357675fd740 ("wifi: cfg80211: enable context analysis") and
still jumps to out_err there. The merge kept the wireless-next version.

That is a double put: the helper has already dropped the wdev reference
by the time it fails, and out_err drops it again.

Just return the error, like the wireless fix does.

Fixes: cf03388aa81e ("Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git")
Link: https://lore.kernel.org/all/avNx0gmZTCIjln1Y@sirena.org.uk/
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
Mark, this is against next-20261110. Please fold it into the wireless-next
merge.

Johannes, wireless-next has the same double put on its own until wireless
gets merged into it.

Found by comparing with our llminus-assisted integration tree. Build tested
only.

 net/wireless/nl80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index d695040cc85cb..8a5c9dd9d0dba 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -9079,7 +9079,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
 				err = __nl80211_lock_held_wdev(rdev, netns,
 							       wdev);
 				if (err)
-					goto out_err;
+					return err;
 
 				/* try again locked now */
 				locked = true;

base-commit: 793807ca13bf3072fc6d16ce6d90e9ab9beff2a5
-- 
2.53.0


      reply	other threads:[~2026-11-11  2:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10 19:34 linux-next: manual merge of the wireless-next tree with the wireless tree Mark Brown
2026-11-11  2:40 ` Sasha Levin [this message]

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=20261111024029.759859-1-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=broonie@kernel.org \
    --cc=johannes.berg@intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®