From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55260535FA9; Wed, 23 Sep 2026 14:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790175271; cv=none; b=XhJjWMqAFj4F9Ecoie7nSyB0bPBMIuiHfApZxUlE/WjojqDzQWKds5DvKSAyUpuyLDzq6b4GBnsOYvHpdJB0CcxewIzg4gK7ShEDxvjZdGuVdFBoV5hkqlyWEnoj4EyS0yh2Diy6uBkP8ADAlGUGbLKg5BJzoHJysoPFEZR9UMk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790175271; c=relaxed/simple; bh=+FJkD6rcMmolNlNzIxxk+SeiEPmhiqhzVlbVz7q02B0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a0C8zFo9CQKpZgFca4Jg5fXI9rfzIXfb3iQdImnd5V8GIy/GxGojbnjgtp5F5anEtabI2x4AWX/8e9CYctqZtYoMa0zshM5HiBAviylieP/7zDjUkWjEnQC0Np4olur/q28pJ7gsuNsYfU5uzbBD8SdebxUXh2iHe6pu3Jy2uno= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZnaoP/3R; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZnaoP/3R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC3CF1F00893; Wed, 23 Sep 2026 14:54:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790175269; bh=qCe7keoX+HsewmEGOYpS1AnT+7Q9d86BDeSh0oaASfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZnaoP/3RLS4BE/s3H9K7o+1fQz4O2nUkfcILmV0Qu7YQfWAH80zKYuSYgqPgpexhs 42gULKQp95ujvdtwAW27iK/v39MF4R18BuDwtptmBStSm0HVoSXE4yDqXIyPk/5m/0 fSRINOCyANSmf4VhtDmX7D8cEBlF0FwAP49X7gjQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Devin Wittmayer , Johannes Berg , Sasha Levin Subject: [PATCH 6.18 374/398] wifi: mac80211: refuse to make a monitor active when it has no queue Date: Wed, 23 Sep 2026 16:07:28 +0200 Message-ID: <20260923140653.142243762@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923140643.441954610@linuxfoundation.org> References: <20260923140643.441954610@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Devin Wittmayer [ Upstream commit 2b04d6556964ae9f89819b86a0a7801e39c3aae5 ] A monitor interface only gets a TXQ if it's created active, and one can't be added later. Setting the flag on a down interface is still allowed, so the driver is handed a monitor with no queue. ath9k dereferences it: BUG: kernel NULL pointer dereference, address: 0000000000000066 RIP: 0010:ath_tx_node_init+0x49/0x170 [ath9k] ath9k_add_interface+0x10c/0x140 [ath9k] drv_add_interface+0x54/0x250 [mac80211] ieee80211_do_open+0x32f/0x800 [mac80211] Reached with CAP_NET_ADMIN by "iw dev X set monitor active" followed by "ip link set X up". RTNL is held, so netlink operations block behind it. Refuse the flag when there is no queue to give. Fixes: 79af1f866193 ("mac80211: avoid allocating TXQs that won't be used") Cc: stable@vger.kernel.org Signed-off-by: Devin Wittmayer Link: https://patch.msgid.link/20260904200338.10829-1-lucid_duck@justthetip.ca Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/mac80211/cfg.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -115,6 +115,10 @@ static int ieee80211_set_mon_options(str return -EBUSY; } + /* TXQs are reserved in ieee80211_if_add() and cannot be added later */ + if ((params->flags & MONITOR_FLAG_ACTIVE) && !sdata->vif.txq) + return -EOPNOTSUPP; + /* validate whether MU-MIMO can be configured */ if (!ieee80211_hw_check(&local->hw, WANT_MONITOR_VIF) && !ieee80211_hw_check(&local->hw, NO_VIRTUAL_MONITOR) &&