| Message ID | 20180219123045.8818-1-johannes@sipsolutions.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 64d1519edc959f5b8f86a66a51c40971c215e4ec |
| Delegated to: | Kalle Valo |
| Headers | show |
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); > } > >
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
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); }