From 779c0a5a92e8e62fc33407df5c3b43413e4852e8 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 18 Apr 2019 11:06:47 -0500 Subject: Fix CVE-2019-9500 (rhbz 1701224 1701226) --- ...sure-SSID-length-from-firmware-is-limited.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 0001-brcmfmac-assure-SSID-length-from-firmware-is-limited.patch (limited to '0001-brcmfmac-assure-SSID-length-from-firmware-is-limited.patch') diff --git a/0001-brcmfmac-assure-SSID-length-from-firmware-is-limited.patch b/0001-brcmfmac-assure-SSID-length-from-firmware-is-limited.patch new file mode 100644 index 000000000..23d43d725 --- /dev/null +++ b/0001-brcmfmac-assure-SSID-length-from-firmware-is-limited.patch @@ -0,0 +1,33 @@ +From 1b5e2423164b3670e8bc9174e4762d297990deff Mon Sep 17 00:00:00 2001 +From: Arend van Spriel +Date: Thu, 14 Feb 2019 13:43:47 +0100 +Subject: [PATCH] brcmfmac: assure SSID length from firmware is limited + +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 +Reviewed-by: Pieter-Paul Giesberts +Reviewed-by: Franky Lin +Signed-off-by: Arend van Spriel +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +index b5e291ed9496..012275fc3bf7 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +@@ -3507,6 +3507,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; +-- +2.20.1 + -- cgit