git: aa8e8f833a6e - stable/14 - LinuxKPI: 802.11: add checks and improve tracing to key operations
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Apr 2025 11:41:52 UTC
The branch stable/14 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=aa8e8f833a6e2045a2edf12e24d125d248a7ee85
commit aa8e8f833a6e2045a2edf12e24d125d248a7ee85
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-04-15 21:11:08 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-04-29 10:49:30 +0000
LinuxKPI: 802.11: add checks and improve tracing to key operations
Use the IEEE80211_KEY_FLAG_BITS for logging. Add more logging to aid
debugging key and cipher operations.
Add extra checks that key is actually defined before attempting any
key operation.
Move some variables to before they are needed to avoid extra work
in case of early return. Makes their scope more clear.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit a6f6329c92a993ddaaa4a7daf2b53155f805d50f)
---
sys/compat/linuxkpi/common/src/linux_80211.c | 63 +++++++++++++++++++++-------
1 file changed, 49 insertions(+), 14 deletions(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
index baad8ad00a69..2dc7b7c8ec9a 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -1184,6 +1184,14 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
continue;
kc = lsta->kc[keyix];
+#ifdef LINUXKPI_DEBUG_80211
+ if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
+ ic_printf(lsta->ni->ni_ic, "%s: running set_key cmd %d(%s) for "
+ "sta %6D: keyidx %u hw_key_idx %u flags %b\n",
+ __func__, DISABLE_KEY, "DISABLE", lsta->sta.addr, ":",
+ kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS);
+#endif
+
err = lkpi_80211_mo_set_key(hw, DISABLE_KEY, vif,
LSTA_TO_STA(lsta), kc);
if (err != 0) {
@@ -1202,9 +1210,9 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
#ifdef LINUXKPI_DEBUG_80211
if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
ic_printf(lsta->ni->ni_ic, "%s: set_key cmd %d(%s) for "
- "sta %6D succeeded: keyidx %u hw_key_idx %u flags %#10x\n",
+ "sta %6D succeeded: keyidx %u hw_key_idx %u flags %b\n",
__func__, DISABLE_KEY, "DISABLE", lsta->sta.addr, ":",
- kc->keyidx, kc->hw_key_idx, kc->flags);
+ kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS);
#endif
lsta->kc[keyix] = NULL;
@@ -1229,16 +1237,18 @@ _lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k)
int error;
ic = vap->iv_ic;
- lhw = ic->ic_softc;
- hw = LHW_TO_HW(lhw);
- lvif = VAP_TO_LVIF(vap);
- vif = LVIF_TO_VIF(lvif);
+ if (IEEE80211_KEY_UNDEFINED(k)) {
+ ic_printf(ic, "%s: vap %p key %p is undefined: %p %u\n",
+ __func__, vap, k, k->wk_cipher, k->wk_keyix);
+ return (0);
+ }
if (vap->iv_bss == NULL) {
ic_printf(ic, "%s: iv_bss %p for vap %p is NULL\n",
__func__, vap->iv_bss, vap);
return (0);
}
+
ni = ieee80211_ref_node(vap->iv_bss);
lsta = ni->ni_drv_data;
if (lsta == NULL) {
@@ -1273,6 +1283,18 @@ _lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k)
goto out;
}
+#ifdef LINUXKPI_DEBUG_80211
+ if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
+ ic_printf(ic, "%s: running set_key cmd %d(%s) for sta %6D: "
+ "keyidx %u hw_key_idx %u flags %b\n", __func__,
+ DISABLE_KEY, "DISABLE", sta->addr, ":",
+ kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS);
+#endif
+
+ lhw = ic->ic_softc;
+ hw = LHW_TO_HW(lhw);
+ lvif = VAP_TO_LVIF(vap);
+ vif = LVIF_TO_VIF(lvif);
error = lkpi_80211_mo_set_key(hw, DISABLE_KEY, vif, sta, kc);
if (error != 0) {
ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D failed: %d\n",
@@ -1284,9 +1306,9 @@ _lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k)
#ifdef LINUXKPI_DEBUG_80211
if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D succeeded: "
- "keyidx %u hw_key_idx %u flags %#10x\n", __func__,
+ "keyidx %u hw_key_idx %u flags %b\n", __func__,
DISABLE_KEY, "DISABLE", sta->addr, ":",
- kc->keyidx, kc->hw_key_idx, kc->flags);
+ kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS);
#endif
lsta->kc[k->wk_keyix] = NULL;
free(kc, M_LKPI80211);
@@ -1321,10 +1343,11 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k)
int error;
ic = vap->iv_ic;
- lhw = ic->ic_softc;
- hw = LHW_TO_HW(lhw);
- lvif = VAP_TO_LVIF(vap);
- vif = LVIF_TO_VIF(lvif);
+ if (IEEE80211_KEY_UNDEFINED(k)) {
+ ic_printf(ic, "%s: vap %p key %p is undefined: %p %u\n",
+ __func__, vap, k, k->wk_cipher, k->wk_keyix);
+ return (0);
+ }
if (vap->iv_bss == NULL) {
ic_printf(ic, "%s: iv_bss %p for vap %p is NULL\n",
@@ -1395,6 +1418,18 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k)
};
lsta->kc[k->wk_keyix] = kc;
+#ifdef LINUXKPI_DEBUG_80211
+ if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
+ ic_printf(ic, "%s: running set_key cmd %d(%s) for sta %6D: "
+ "kc %p keyidx %u hw_key_idx %u flags %b\n", __func__,
+ SET_KEY, "SET", sta->addr, ":",
+ kc, kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS);
+#endif
+
+ lhw = ic->ic_softc;
+ hw = LHW_TO_HW(lhw);
+ lvif = VAP_TO_LVIF(vap);
+ vif = LVIF_TO_VIF(lvif);
error = lkpi_80211_mo_set_key(hw, SET_KEY, vif, sta, kc);
if (error != 0) {
ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D failed: %d\n",
@@ -1408,9 +1443,9 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k)
#ifdef LINUXKPI_DEBUG_80211
if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D succeeded: "
- "kc %p keyidx %u hw_key_idx %u flags %#010x\n", __func__,
+ "kc %p keyidx %u hw_key_idx %u flags %b\n", __func__,
SET_KEY, "SET", sta->addr, ":",
- kc, kc->keyidx, kc->hw_key_idx, kc->flags);
+ kc, kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS);
#endif
ieee80211_free_node(ni);