Skip to contentSkip to conversation

staging: wilc1000: potential corruption in wilc_parse_join_bss_param()

PATCH In review Dan Carpenter 2 participants 2 messages Oct 17, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: wilc1000: potential corruption in wilc_parse_join_bss_param()

The "rates_len" value needs to be capped so that the memcpy() doesn't copy beyond the end of the array.

Fixes c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
---
 drivers/staging/wilc1000/wilc_hif.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/wilc1000/wilc_hif.c +2 -0
index 0ac2b6ac50b0..e0a95c5cc0d5 100644
@@ -479,6 +479,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
 	rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies->data, ies->len);
 	if (rates_ie) {
 		rates_len = rates_ie[1];
+		if (rates_len > WILC_MAX_RATES_SUPPORTED)
+			rates_len = WILC_MAX_RATES_SUPPORTED;
 		param->supp_rates[0] = rates_len;
 		memcpy(&param->supp_rates[1], rates_ie + 2, rates_len);
 	}
Signature · 1 line
2.20.1
#1 lore raw

DQoNCk9uIDEwLzE3LzE5IDI6MTggQU0sIERhbiBDYXJwZW50ZXIgd3JvdGU6DQo+IFRoZSAicmF0 ZXNfbGVuIiB2YWx1ZSBuZWVkcyB0byBiZSBjYXBwZWQgc28gdGhhdCB0aGUgbWVtY3B5KCkgZG9l c24ndA0KPiBjb3B5IGJleW9uZCB0aGUgZW5kIG9mIHRoZSBhcnJheS4NCj4NCj4gRml4ZXM6IGM1 Yzc3YmExOGVhNiAoInN0YWdpbmc6IHdpbGMxMDAwOiBBZGQgU0RJTy9TUEkgODAyLjExIGRyaXZl ciIpDQo+IFNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xl LmNvbT4NCj4gLS0tDQo+ICBkcml2ZXJzL3N0YWdpbmcvd2lsYzEwMDAvd2lsY19oaWYuYyB8IDIg KysNCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKykNCg0KUmV2aWV3ZWQtYnk6IEFk aGFtIEFib3phZWlkIDxhZGhhbS5hYm96YWVpZEBtaWNyb2NoaXAuY29tPg0KDQpUaGFua3MgRGFu IGZvciB0aGUgcGF0Y2guDQoNCg0K