summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Gibson <leegib@gmail.com>2021-02-26 14:51:57 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-17 16:07:22 +0100
commitb5247b6661a55fb3de9c73a7227e630b218b35b5 (patch)
tree0baade6b345d9cb314ccd28203b8d5eebe040e8a
parente6cd3f4569d47af6a80b7a1b4ce96128362efcd3 (diff)
downloadlinux-stable-b5247b6661a55fb3de9c73a7227e630b218b35b5.tar.gz
linux-stable-b5247b6661a55fb3de9c73a7227e630b218b35b5.tar.bz2
linux-stable-b5247b6661a55fb3de9c73a7227e630b218b35b5.zip
staging: rtl8192e: Fix possible buffer overflow in _rtl92e_wx_set_scan
commit 8687bf9ef9551bcf93897e33364d121667b1aadf upstream. Function _rtl92e_wx_set_scan calls memcpy without checking the length. A user could control that length and trigger a buffer overflow. Fix by checking the length is within the maximum allowed size. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Lee Gibson <leegib@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20210226145157.424065-1-leegib@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8192e/rtl8192e/rtl_wx.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 70df6a1485d6..6f0be1db6fb1 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -419,9 +419,10 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,
struct iw_scan_req *req = (struct iw_scan_req *)b;
if (req->essid_len) {
- ieee->current_network.ssid_len = req->essid_len;
- memcpy(ieee->current_network.ssid, req->essid,
- req->essid_len);
+ int len = min_t(int, req->essid_len, IW_ESSID_MAX_SIZE);
+
+ ieee->current_network.ssid_len = len;
+ memcpy(ieee->current_network.ssid, req->essid, len);
}
}