Message ID | 20250130123432.4534-1-v.shevtsov@mt-integration.ru (mailing list archive) |
---|---|
State | New |
Delegated to: | Johannes Berg |
Headers | show |
Series | wifi: nl80211: override all other flags if MONITOR_FLAG_COOK_FRAMES is set | expand |
On Thu, 30. Jan 13:36, Johannes Berg wrote: > On Thu, 2025-01-30 at 17:34 +0500, Vitaliy Shevtsov wrote: > > It is possible to set both MONITOR_FLAG_COOK_FRAMES and MONITOR_FLAG_ACTIVE > > flags simultaneously on the same monitor interface from the userspace. This > > causes a sub-interface to be created with no IEEE80211_SDATA_IN_DRIVER bit > > set because the monitor interface is in the cooked state and it takes > > precedence over all other states. When the interface is then being deleted > > the kernel calls WARN_ONCE() from check_sdata_in_driver() because of missing > > that bit. > > > > Fix this by overriding all flags if MONITOR_FLAG_COOK_FRAMES is set because > > this flag is incompatible with other monitor flags being set. > > > > That seems wrong, reject it instead. Anyway we should probably remove > cooked mode. Do you suggest rejecting to set MONITOR_FLAG_COOK_FRAMES overall? Wouldn't it break existing userspace, especially in context of systems running old stable kernels where the patch is also needed? There is still some usage of this flag in hostap [1]. Or your suggestion is to explicitly reject setting MONITOR_FLAG_COOK_FRAMES only when it is passed combined with some other flags which it is incompatible with? Btw, the fragment [2] says the cooked flag overrides the other ones. But it was written a long time ago so many things have changed I guess. /** * enum nl80211_mntr_flags - monitor configuration flags * * Monitor configuration flags. ... * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing. * overrides all other flags. [1]: https://w1.fi/cgit/hostap/tree/src/drivers/driver_nl80211.c#n6209 [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/nl80211.h#n4731 -- Thanks, Fedor
On Thu, 2025-01-30 at 22:23 +0300, Fedor Pchelkin wrote: > > Do you suggest rejecting to set MONITOR_FLAG_COOK_FRAMES overall? No and yes :) No for the context of this patch. Yes in general. > Wouldn't it break existing userspace, especially in context of systems > running old stable kernels where the patch is also needed? > > There is still some usage of this flag in hostap [1]. Theoretically, but I just commented on that here: https://lore.kernel.org/r/a49e58998553c45953a30243ad1957c06ce6db8c.camel@sipsolutions.net tl;dr: only ancient hostapd versions will actually _use_ it, and they have to fall into a relatively narrow range (April 2009 - Dec 2011.) > Or your suggestion is to explicitly reject setting MONITOR_FLAG_COOK_FRAMES > only when it is passed combined with some other flags which it is > incompatible with? Yes. > Btw, the fragment [2] says the cooked flag overrides the other ones. > But it was written a long time ago so many things have changed I guess. Indeed, that doesn't really make sense (certainly not any longer.) > [1]: https://w1.fi/cgit/hostap/tree/src/drivers/driver_nl80211.c#n6209 And that was almost certainly the only user that ever existed, and can only set the flag by itself. johannes
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index d7d3da0f6833..1338b0a06f8d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4220,6 +4220,10 @@ static int parse_monitor_flags(struct nlattr *nla, u32 *mntrflags) if (flags[flag]) *mntrflags |= (1<<flag); + /* MONITOR_FLAG_COOK_FRAMES must override all other flags */ + if (*mntrflags & MONITOR_FLAG_COOK_FRAMES) + *mntrflags = MONITOR_FLAG_COOK_FRAMES; + *mntrflags |= MONITOR_FLAG_CHANGED; return 0;
It is possible to set both MONITOR_FLAG_COOK_FRAMES and MONITOR_FLAG_ACTIVE flags simultaneously on the same monitor interface from the userspace. This causes a sub-interface to be created with no IEEE80211_SDATA_IN_DRIVER bit set because the monitor interface is in the cooked state and it takes precedence over all other states. When the interface is then being deleted the kernel calls WARN_ONCE() from check_sdata_in_driver() because of missing that bit. Fix this by overriding all flags if MONITOR_FLAG_COOK_FRAMES is set because this flag is incompatible with other monitor flags being set. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: 66f7ac50ed7c (nl80211: Add monitor interface configuration flags) Reported-by: syzbot+2e5c1e55b9e5c28a3da7@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=2e5c1e55b9e5c28a3da7 Signed-off-by: Vitaliy Shevtsov <v.shevtsov@mt-integration.ru> --- net/wireless/nl80211.c | 4 ++++ 1 file changed, 4 insertions(+)