Commit 62b14b24 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: properly deal with station hashtable insert errors

The original hand-implemented hash-table in mac80211 couldn't result
in insertion errors, and while converting to rhashtable I evidently
forgot to check the errors.

This surfaced now only because Ben is adding many identical keys and
that resulted in hidden insertion errors.

Fixes: 7bedd0cf

 ("mac80211: use rhashtable for station table")
Reported-by: default avatarBen Greear <>
Signed-off-by: default avatarJohannes Berg <>
parent aa507a7b
......@@ -258,11 +258,11 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
/* Caller must hold local->sta_mtx */
static void sta_info_hash_add(struct ieee80211_local *local,
struct sta_info *sta)
static int sta_info_hash_add(struct ieee80211_local *local,
struct sta_info *sta)
rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,
return rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,
static void sta_deliver_ps_frames(struct work_struct *wk)
......@@ -524,7 +524,9 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
set_sta_flag(sta, WLAN_STA_BLOCK_BA);
/* make the station visible */
sta_info_hash_add(local, sta);
err = sta_info_hash_add(local, sta);
if (err)
goto out_drop_sta;
list_add_tail_rcu(&sta->list, &local->sta_list);
......@@ -557,6 +559,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
sta_info_hash_del(local, sta);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment