2
0

349-v5.1-0001-brcmfmac-assure-SSID-length-from-firmware-is-limited.patch 1.2 KB

12345678910111213141516171819202122232425262728
  1. From 1b5e2423164b3670e8bc9174e4762d297990deff Mon Sep 17 00:00:00 2001
  2. From: Arend van Spriel <[email protected]>
  3. Date: Thu, 14 Feb 2019 13:43:47 +0100
  4. Subject: [PATCH] brcmfmac: assure SSID length from firmware is limited
  5. The SSID length as received from firmware should not exceed
  6. IEEE80211_MAX_SSID_LEN as that would result in heap overflow.
  7. Reviewed-by: Hante Meuleman <[email protected]>
  8. Reviewed-by: Pieter-Paul Giesberts <[email protected]>
  9. Reviewed-by: Franky Lin <[email protected]>
  10. Signed-off-by: Arend van Spriel <[email protected]>
  11. Signed-off-by: Kalle Valo <[email protected]>
  12. ---
  13. drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 ++
  14. 1 file changed, 2 insertions(+)
  15. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  16. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  17. @@ -3499,6 +3499,8 @@ brcmf_wowl_nd_results(struct brcmf_if *i
  18. }
  19. netinfo = brcmf_get_netinfo_array(pfn_result);
  20. + if (netinfo->SSID_len > IEEE80211_MAX_SSID_LEN)
  21. + netinfo->SSID_len = IEEE80211_MAX_SSID_LEN;
  22. memcpy(cfg->wowl.nd->ssid.ssid, netinfo->SSID, netinfo->SSID_len);
  23. cfg->wowl.nd->ssid.ssid_len = netinfo->SSID_len;
  24. cfg->wowl.nd->n_channels = 1;