* [PATCH] cfg80211: fix a crash in the active monitor check
@ 2013-05-28 21:20 Felix Fietkau
2013-05-29 7:11 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Felix Fietkau @ 2013-05-28 21:20 UTC (permalink / raw)
To: linux-wireless; +Cc: johannes
flags can be NULL
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
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 820b756..ede00e2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2391,7 +2391,7 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
change = true;
}
- if ((*flags & NL80211_MNTR_FLAG_ACTIVE) &&
+ if (flags && (*flags & NL80211_MNTR_FLAG_ACTIVE) &&
!(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
return -EOPNOTSUPP;
--
1.8.0.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cfg80211: fix a crash in the active monitor check
2013-05-28 21:20 [PATCH] cfg80211: fix a crash in the active monitor check Felix Fietkau
@ 2013-05-29 7:11 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2013-05-29 7:11 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless
On Tue, 2013-05-28 at 23:20 +0200, Felix Fietkau wrote:
> flags can be NULL
I merged this into the original patch and also fixed the kernel-doc for
you while at it.
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-29 7:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-28 21:20 [PATCH] cfg80211: fix a crash in the active monitor check Felix Fietkau
2013-05-29 7:11 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).