Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9ba91b5 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

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: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c20f6d01

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

+2 −0
Original line number Diff line number Diff line
@@ -3581,6 +3581,8 @@ brcmf_wowl_nd_results(struct brcmf_if *ifp, const struct brcmf_event_msg *e, 
	}



	netinfo = brcmf_get_netinfo_array(pfn_result);

	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;