Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ef69d03 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: fix key allocation error handling for powersave keys 



If no keycache slots are available, ath_key_config can return -ENOSPC.
If the key index is not checked for errors, it can lead to logspam that
looks like this: "ath: wiphy0: keyreset: keycache entry 228 out of range"
This can cause follow-up errors if the invalid keycache index gets
used for tx.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a8a48e60

drivers/net/wireless/ath/ath9k/main.c

+5 −1
Original line number Diff line number Diff line
@@ -1332,6 +1332,7 @@ static int ath9k_sta_add(struct ieee80211_hw *hw, 
	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct ath_node *an = (struct ath_node *) sta->drv_priv;

	struct ieee80211_key_conf ps_key = { };

	int key;



	ath_node_attach(sc, sta, vif);
@@ -1339,7 +1340,9 @@ static int ath9k_sta_add(struct ieee80211_hw *hw, 
	    vif->type != NL80211_IFTYPE_AP_VLAN)

		return 0;



	an->ps_key = ath_key_config(common, vif, sta, &ps_key);

	key = ath_key_config(common, vif, sta, &ps_key);

	if (key > 0)

		an->ps_key = key;



	return 0;

}
@@ -1356,6 +1359,7 @@ static void ath9k_del_ps_key(struct ath_softc *sc, 
	    return;



	ath_key_delete(common, &ps_key);

	an->ps_key = 0;

}



static int ath9k_sta_remove(struct ieee80211_hw *hw,