]> git.itanic.dy.fi Git - linux-stable/commitdiff
staging: rtl8188eu: prevent ->ssid overflow in rtw_wx_set_scan()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 5 Mar 2021 08:58:03 +0000 (11:58 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Mar 2021 15:07:22 +0000 (16:07 +0100)
commit 74b6b20df8cfe90ada777d621b54c32e69e27cd7 upstream.

This code has a check to prevent read overflow but it needs another
check to prevent writing beyond the end of the ->ssid[] array.

Fixes: a2c60d42d97c ("staging: r8188eu: Add files for new driver - part 16")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/YEHymwsnHewzoam7@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

index 2a6192e08b750b9220a750ac800b2804a6e696e6..c29dc918247030b28961317978d333ece04bc49e 100644 (file)
@@ -1174,9 +1174,11 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
                                                break;
                                        }
                                        sec_len = *(pos++); len -= 1;
-                                       if (sec_len > 0 && sec_len <= len) {
+                                       if (sec_len > 0 &&
+                                           sec_len <= len &&
+                                           sec_len <= 32) {
                                                ssid[ssid_index].SsidLength = sec_len;
-                                               memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength);
+                                               memcpy(ssid[ssid_index].Ssid, pos, sec_len);
                                                ssid_index++;
                                        }
                                        pos += sec_len;