From: Luciano Coelho Date: Tue, 7 Jun 2011 17:42:26 +0000 (+0300) Subject: nl80211: fix overflow in ssid_len X-Git-Tag: v2.6.34.13~168 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=075c4ced91c551cdc2e9bb99b1697c3d54be106e;p=karo-tx-linux.git nl80211: fix overflow in ssid_len commit 57a27e1d6a3bb9ad4efeebd3a8c71156d6207536 upstream. When one of the SSID's length passed in a scan or sched_scan request is larger than 255, there will be an overflow in the u8 that is used to store the length before checking. This causes the check to fail and we overrun the buffer when copying the SSID. Fix this by checking the nl80211 attribute length before copying it to the struct. This is a follow up for the previous commit 208c72f4fe44fe09577e7975ba0e7fa0278f3d03, which didn't fix the problem entirely. Reported-by: Ido Yariv Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville [PG: 34 codebase does not have nl80211_start_sched_scan part] Signed-off-by: Paul Gortmaker --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 0ba104fa3520..56bc9b99da22 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3072,11 +3072,11 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) i = 0; if (info->attrs[NL80211_ATTR_SCAN_SSIDS]) { nla_for_each_nested(attr, info->attrs[NL80211_ATTR_SCAN_SSIDS], tmp) { - request->ssids[i].ssid_len = nla_len(attr); - if (request->ssids[i].ssid_len > IEEE80211_MAX_SSID_LEN) { + if (nla_len(attr) > IEEE80211_MAX_SSID_LEN) { err = -EINVAL; goto out_free; } + request->ssids[i].ssid_len = nla_len(attr); memcpy(request->ssids[i].ssid, nla_data(attr), nla_len(attr)); i++; }