diff options
| author | dataanddreams <dataanddreams@gmail.com> | 2015-11-30 17:08:54 -0500 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-03-10 13:13:34 -0800 |
| commit | 9466667a5f324c898aafd2e886cf924b69ecce19 (patch) | |
| tree | 8197b956833e7b66f3d60ac938f1a4000933d6c8 | |
| parent | 4c8d7f9cb6315c6528c4938949a9cb05c68df25f (diff) | |
| download | v4.1-9466667a5f324c898aafd2e886cf924b69ecce19.tar.gz | |
bcmdhd: Add checks for stack buffer overflows
These two checks prevent exploitable buffer overflows in two scenarios.
1. Long WPS_ID_DEVICE_NAME in WPS info elements
2. Invalid SSID determined in certain scan results
Bug: 27335848
[fixes CVE-2016-0801]
Signed-off-by: Kees Cook <keescook@chromium.org>
Change-Id: I755543d84770be58ef2467745d5d2b55682a126a
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index b3cad173baa..3e9906180d9 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -1324,8 +1324,9 @@ wl_validate_wps_ie(char *wps_ie, s32 wps_ie_len, bool *pbc) WL_DBG((" attr WPS_ID_CONFIG_METHODS: %x\n", HTON16(val))); } else if (subelt_id == WPS_ID_DEVICE_NAME) { char devname[100]; - memcpy(devname, subel, subelt_len); - devname[subelt_len] = '\0'; + size_t namelen = MIN(subelt_len, sizeof(devname)); + memcpy(devname, subel, namelen); + devname[namelen-1] = '\0'; WL_DBG((" attr WPS_ID_DEVICE_NAME: %s (len %u)\n", devname, subelt_len)); } else if (subelt_id == WPS_ID_DEVICE_PWD_ID) { @@ -11441,9 +11442,9 @@ wl_notify_sched_scan_results(struct bcm_cfg80211 *cfg, struct net_device *ndev, * scan request in the form of cfg80211_scan_request. For timebeing, create * cfg80211_scan_request one out of the received PNO event. */ + ssid[i].ssid_len = MIN(DOT11_MAX_SSID_LEN, netinfo->pfnsubnet.SSID_len); memcpy(ssid[i].ssid, netinfo->pfnsubnet.SSID, - netinfo->pfnsubnet.SSID_len); - ssid[i].ssid_len = netinfo->pfnsubnet.SSID_len; + ssid[i].ssid_len); request->n_ssids++; channel_req = netinfo->pfnsubnet.channel; |