android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: wifi: cfg80211: Support 32 bytes KCK key in GTK rekey offload

Browse Source 
Currently, maximum KCK key length supported for GTK rekey offload is 24
bytes but with some newer AKMs the KCK key length can be 32 bytes. e.g.,
00-0F-AC:24 AKM suite with SAE finite cyclic group 21. Add support to
allow 32 bytes KCK keys in GTK rekey offload.

Signed-off-by: Shivani Baranwal <quic_shivbara@quicinc.com>
Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
Link: https://lore.kernel.org/r/20221206143715.1802987-3-quic_vjakkam@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Bug: 271996243
Change-Id: I065477436f41780425e3d1417fc7deddbe18da1c
(cherry picked from commit 648fba791cb0f5ef6166449d056f82e6639fe268)
Signed-off-by: Shivani Baranwal <quic_shivbara@quicinc.com>
This commit is contained in:
Shivani Baranwal 2022-12-06 20:07:15 +05:30 committed by Greg Kroah-Hartman
parent c20c83bbab
commit c59181f352
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/cfg80211.h
View File

@ -4690,6 +4690,7 @@ struct cfg80211_ops {
* in order to not have them reachable in normal drivers, until we have * in order to not have them reachable in normal drivers, until we have
* complete feature/interface combinations/etc. advertisement. No driver * complete feature/interface combinations/etc. advertisement. No driver
* should set this flag for now. * should set this flag for now.
* @WIPHY_FLAG_SUPPORTS_EXT_KCK_32: The device supports 32-byte KCK keys.
*/ */
enum wiphy_flags { enum wiphy_flags {
WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK = BIT(0), WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK = BIT(0),
@ -4702,7 +4703,7 @@ enum wiphy_flags {
WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7), WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7),
WIPHY_FLAG_IBSS_RSN = BIT(8), WIPHY_FLAG_IBSS_RSN = BIT(8),
WIPHY_FLAG_MESH_AUTH = BIT(10), WIPHY_FLAG_MESH_AUTH = BIT(10),
/* use hole at 11 */ WIPHY_FLAG_SUPPORTS_EXT_KCK_32 = BIT(11),
/* use hole at 12 */ /* use hole at 12 */
WIPHY_FLAG_SUPPORTS_FW_ROAM = BIT(13), WIPHY_FLAG_SUPPORTS_FW_ROAM = BIT(13),
WIPHY_FLAG_AP_UAPSD = BIT(14), WIPHY_FLAG_AP_UAPSD = BIT(14),

1
include/uapi/linux/nl80211.h
View File

@ -5866,6 +5866,7 @@ enum plink_actions {
#define NL80211_KEK_LEN 16 #define NL80211_KEK_LEN 16
#define NL80211_KCK_EXT_LEN 24 #define NL80211_KCK_EXT_LEN 24
#define NL80211_KEK_EXT_LEN 32 #define NL80211_KEK_EXT_LEN 32
#define NL80211_KCK_EXT_LEN_32 32
#define NL80211_REPLAY_CTR_LEN 8 #define NL80211_REPLAY_CTR_LEN 8
/** /**

6
net/wireless/nl80211.c
View File

@ -883,7 +883,7 @@ nl80211_rekey_policy[NUM_NL80211_REKEY_DATA] = {
}, },
[NL80211_REKEY_DATA_KCK] = { [NL80211_REKEY_DATA_KCK] = {
.type = NLA_BINARY, .type = NLA_BINARY,
.len = NL80211_KCK_EXT_LEN .len = NL80211_KCK_EXT_LEN_32
}, },
[NL80211_REKEY_DATA_REPLAY_CTR] = NLA_POLICY_EXACT_LEN(NL80211_REPLAY_CTR_LEN), [NL80211_REKEY_DATA_REPLAY_CTR] = NLA_POLICY_EXACT_LEN(NL80211_REPLAY_CTR_LEN),
[NL80211_REKEY_DATA_AKM] = { .type = NLA_U32 }, [NL80211_REKEY_DATA_AKM] = { .type = NLA_U32 },
@ -13807,7 +13807,9 @@ static int nl80211_set_rekey_data(struct sk_buff *skb, struct genl_info *info)
return -ERANGE; return -ERANGE;
if (nla_len(tb[NL80211_REKEY_DATA_KCK]) != NL80211_KCK_LEN && if (nla_len(tb[NL80211_REKEY_DATA_KCK]) != NL80211_KCK_LEN &&
!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK && !(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK &&
nla_len(tb[NL80211_REKEY_DATA_KCK]) == NL80211_KCK_EXT_LEN)) nla_len(tb[NL80211_REKEY_DATA_KCK]) == NL80211_KCK_EXT_LEN) &&
!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_EXT_KCK_32 &&
nla_len(tb[NL80211_REKEY_DATA_KCK]) == NL80211_KCK_EXT_LEN_32))
return -ERANGE; return -ERANGE;
rekey_data.kek = nla_data(tb[NL80211_REKEY_DATA_KEK]); rekey_data.kek = nla_data(tb[NL80211_REKEY_DATA_KEK]);