浏览代码

mac80211: fix sta_info_destroy(NULL)

sta_info_destroy(NULL) should be valid, but currently isn't because
the argument is dereferenced before the NULL check. There are no
users that currently pass in NULL, i.e. all check before calling the
function, but I want to change that.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Johannes Berg 17 年之前
父节点
当前提交
97bff8ecf4
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      net/mac80211/sta_info.c

+ 5 - 3
net/mac80211/sta_info.c

@@ -129,16 +129,18 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_local *local, int idx,
 
 
 void sta_info_destroy(struct sta_info *sta)
 void sta_info_destroy(struct sta_info *sta)
 {
 {
-	struct ieee80211_local *local = sta->local;
+	struct ieee80211_local *local;
 	struct sk_buff *skb;
 	struct sk_buff *skb;
 	int i;
 	int i;
 	DECLARE_MAC_BUF(mbuf);
 	DECLARE_MAC_BUF(mbuf);
 
 
+	ASSERT_RTNL();
+	might_sleep();
+
 	if (!sta)
 	if (!sta)
 		return;
 		return;
 
 
-	ASSERT_RTNL();
-	might_sleep();
+	local = sta->local;
 
 
 	rate_control_remove_sta_debugfs(sta);
 	rate_control_remove_sta_debugfs(sta);
 	ieee80211_sta_debugfs_remove(sta);
 	ieee80211_sta_debugfs_remove(sta);