* [PATCH] brcmfmac: reject too long PSK
@ 2018-02-19 12:30 Johannes Berg
2018-02-21 8:44 ` Arend van Spriel
2018-02-27 16:24 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Johannes Berg @ 2018-02-19 12:30 UTC (permalink / raw)
To: linux-wireless; +Cc: arend.vanspriel, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
nl80211 already allows specifying 48 bytes, but brcmfmac
only supports 32. Reject keys that are too long.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 15fa00d79fc6..74a83020c073 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -5124,6 +5124,9 @@ static int brcmf_cfg80211_set_pmk(struct wiphy *wiphy, struct net_device *dev,
if (WARN_ON(ifp->vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_1X))
return -EINVAL;
+ if (conf->pmk_len > BRCMF_WSEC_MAX_PSK_LEN)
+ return -ERANGE;
+
return brcmf_set_pmk(ifp, conf->pmk, conf->pmk_len);
}
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] brcmfmac: reject too long PSK
2018-02-19 12:30 [PATCH] brcmfmac: reject too long PSK Johannes Berg
@ 2018-02-21 8:44 ` Arend van Spriel
2018-02-27 16:24 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Arend van Spriel @ 2018-02-21 8:44 UTC (permalink / raw)
To: Johannes Berg, linux-wireless; +Cc: Johannes Berg
On 2/19/2018 1:30 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> nl80211 already allows specifying 48 bytes, but brcmfmac
> only supports 32. Reject keys that are too long.
Hah. Recent discussion about the key length made you look ;-) Thanks!
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 15fa00d79fc6..74a83020c073 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -5124,6 +5124,9 @@ static int brcmf_cfg80211_set_pmk(struct wiphy *wiphy, struct net_device *dev,
> if (WARN_ON(ifp->vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_1X))
> return -EINVAL;
>
> + if (conf->pmk_len > BRCMF_WSEC_MAX_PSK_LEN)
> + return -ERANGE;
> +
> return brcmf_set_pmk(ifp, conf->pmk, conf->pmk_len);
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: brcmfmac: reject too long PSK
2018-02-19 12:30 [PATCH] brcmfmac: reject too long PSK Johannes Berg
2018-02-21 8:44 ` Arend van Spriel
@ 2018-02-27 16:24 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2018-02-27 16:24 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, arend.vanspriel, Johannes Berg
Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> nl80211 already allows specifying 48 bytes, but brcmfmac
> only supports 32. Reject keys that are too long.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Patch applied to wireless-drivers-next.git, thanks.
64d1519edc95 brcmfmac: reject too long PSK
--
https://patchwork.kernel.org/patch/10227649/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-27 16:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-19 12:30 [PATCH] brcmfmac: reject too long PSK Johannes Berg
2018-02-21 8:44 ` Arend van Spriel
2018-02-27 16:24 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).