diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2021-03-05 11:12:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-17 16:07:22 +0100 |
| commit | 6071e18fa6baf76c80c9e498a18703f2b390038c (patch) | |
| tree | 56127a7d3ff398a251753c7eaacc5830a29c97d7 | |
| parent | 9ee196f307ec006cac386a0d8b7935dd2ccd0083 (diff) | |
| download | linux-stable-6071e18fa6baf76c80c9e498a18703f2b390038c.tar.gz linux-stable-6071e18fa6baf76c80c9e498a18703f2b390038c.tar.bz2 linux-stable-6071e18fa6baf76c80c9e498a18703f2b390038c.zip | |
staging: rtl8192u: fix ->ssid overflow in r8192_wx_set_scan()
commit 87107518d7a93fec6cdb2559588862afeee800fb upstream.
We need to cap len at IW_ESSID_MAX_SIZE (32) to avoid memory corruption.
This can be controlled by the user via the ioctl.
Fixes: 5f53d8ca3d5d ("Staging: add rtl8192SU wireless usb driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/YEHoAWMOSZBUw91F@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8192u/r8192U_wx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/rtl8192u/r8192U_wx.c b/drivers/staging/rtl8192u/r8192U_wx.c index 4911fef2e2e5..8fb194075149 100644 --- a/drivers/staging/rtl8192u/r8192U_wx.c +++ b/drivers/staging/rtl8192u/r8192U_wx.c @@ -341,8 +341,10 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a, 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); } } |