Skip to contentSkip to conversation

cfg80211: Use correct GFP_ mask in cfg80211_del_sta_sinfo()

PATCH In review Dan Carpenter 2 participants 2 messages May 16, 2018

Subsystems (2)
Kernel janitors 802.11 (including cfg80211/NL80211)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 cfg80211: Use correct GFP_ mask in cfg80211_del_sta_sinfo()

Smatch complains that we should use the passed in "gfp" instead of hard coding GFP_KERNEL. I looked at some of the callers and this would probably be a bug for rtw_cfg80211_indicate_sta_disassoc() which uses GFP_ATOMIC and a NULL "sinfo".

Fixes 52539ca89f36 ("cfg80211: Expose TXQ stats and parameters to userspace")
Signed-off-by Dan Carpenter <[email protected]>
net/wireless/nl80211.c +1 -1
index afbe5105bf7f..3eb645b81777 100644
@@ -14644,7 +14644,7 @@ void cfg80211_del_sta_sinfo(struct net_device *dev, const u8 *mac_addr,
 	struct station_info *empty_sinfo = NULL;
 
 	if (!sinfo) {
-		empty_sinfo = kzalloc(sizeof(*empty_sinfo), GFP_KERNEL);
+		empty_sinfo = kzalloc(sizeof(*empty_sinfo), gfp);
 		if (!empty_sinfo)
 			return;
 		sinfo = empty_sinfo;
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Dan Carpenter

Smatch complains that we should use the passed in "gfp" instead of hard coding GFP_KERNEL. I looked at some of the callers and this would probably be a bug for rtw_cfg80211_indicate_sta_disassoc() which uses GFP_ATOMIC and a NULL "sinfo".

Fixes 52539ca89f36 ("cfg80211: Expose TXQ stats and parameters to userspace")
Signed-off-by Dan Carpenter <[email protected]>

Ah, right, didn't notice that that was supposed to be a gfp value. Thanks for the fix :)

Acked-by Toke Høiland-Jørgensen <[email protected]>

-Toke