mac80211: backport brcmfmac data structure rework
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 326-v4.17-0001-brcmfmac-reject-too-long-PSK.patch
1 From 64d1519edc959f5b8f86a66a51c40971c215e4ec Mon Sep 17 00:00:00 2001
2 From: Johannes Berg <johannes.berg@intel.com>
3 Date: Mon, 19 Feb 2018 13:30:45 +0100
4 Subject: [PATCH] brcmfmac: reject too long PSK
5
6 nl80211 already allows specifying 48 bytes, but brcmfmac
7 only supports 32. Reject keys that are too long.
8
9 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
10 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
12 ---
13 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
14 1 file changed, 3 insertions(+)
15
16 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
17 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
18 @@ -5125,6 +5125,9 @@ static int brcmf_cfg80211_set_pmk(struct
19 if (WARN_ON(ifp->vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_1X))
20 return -EINVAL;
21
22 + if (conf->pmk_len > BRCMF_WSEC_MAX_PSK_LEN)
23 + return -ERANGE;
24 +
25 return brcmf_set_pmk(ifp, conf->pmk, conf->pmk_len);
26 }
27