Commit 76e7e98e authored Feb 14, 2019 by Arend van Spriel Committed by Greg Kroah-Hartman Jun 11, 2019

brcmfmac: assure SSID length from firmware is limited



commit 1b5e2423164b3670e8bc9174e4762d297990deff upstream.

The SSID length as received from firmware should not exceed
IEEE80211_MAX_SSID_LEN as that would result in heap overflow.

Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
[bwh: Backported to 4.9: adjust context]
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0c7d97d4

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3579,6 +3579,8 @@ brcmf_wowl_nd_results(struct brcmf_if ifp, const struct brcmf_event_msg e,

		data += sizeof(struct brcmf_pno_scanresults_le);
		netinfo = (struct brcmf_pno_net_info_le *)data;
		if (netinfo->SSID_len > IEEE80211_MAX_SSID_LEN)
		netinfo->SSID_len = IEEE80211_MAX_SSID_LEN;
		memcpy(cfg->wowl.nd->ssid.ssid, netinfo->SSID, netinfo->SSID_len);
		cfg->wowl.nd->ssid.ssid_len = netinfo->SSID_len;
		cfg->wowl.nd->n_channels = 1;