From: Johannes Berg Date: Thu, 27 Jun 2024 08:44:11 +0000 (+0200) Subject: wifi: nl80211: don't give key data to userspace X-Git-Tag: v6.11-rc1~163^2~49^2~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7e5793035792cc46a1a4b0a783655ffa897dfe9;p=thirdparty%2Fkernel%2Flinux.git wifi: nl80211: don't give key data to userspace When a key is requested by userspace, there's really no need to include the key data, the sequence counter is really what userspace needs in this case. The fact that it's included is just a historic quirk. Remove the key data. Reviewed-by: Miriam Rachel Korenblit Link: https://patch.msgid.link/20240627104411.b6a4f097e4ea.I7e6cc976cb9e8a80ef25a3351330f313373b4578@changeid Signed-off-by: Johannes Berg --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 19d81200a2a23..674368d028f38 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4487,10 +4487,7 @@ static void get_key_callback(void *c, struct key_params *params) struct nlattr *key; struct get_key_cookie *cookie = c; - if ((params->key && - nla_put(cookie->msg, NL80211_ATTR_KEY_DATA, - params->key_len, params->key)) || - (params->seq && + if ((params->seq && nla_put(cookie->msg, NL80211_ATTR_KEY_SEQ, params->seq_len, params->seq)) || (params->cipher && @@ -4502,10 +4499,7 @@ static void get_key_callback(void *c, struct key_params *params) if (!key) goto nla_put_failure; - if ((params->key && - nla_put(cookie->msg, NL80211_KEY_DATA, - params->key_len, params->key)) || - (params->seq && + if ((params->seq && nla_put(cookie->msg, NL80211_KEY_SEQ, params->seq_len, params->seq)) || (params->cipher &&