mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 20:51:03 +02:00
staging: ks7010: prevent buffer overflow in ks_wlan_set_scan()
The user can specify a "req->essid_len" of up to 255 but if it's
over IW_ESSID_MAX_SIZE (32) that can lead to memory corruption.
Fixes: 13a9930d15
("staging: ks7010: add driver from Nanonote extra-repository")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/YD4fS8+HmM/Qmrw6@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
b93c1e3981
commit
e163b9823a
@@ -1120,6 +1120,7 @@ static int ks_wlan_set_scan(struct net_device *dev,
|
|||||||
{
|
{
|
||||||
struct ks_wlan_private *priv = netdev_priv(dev);
|
struct ks_wlan_private *priv = netdev_priv(dev);
|
||||||
struct iw_scan_req *req = NULL;
|
struct iw_scan_req *req = NULL;
|
||||||
|
int len;
|
||||||
|
|
||||||
if (priv->sleep_mode == SLP_SLEEP)
|
if (priv->sleep_mode == SLP_SLEEP)
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
@@ -1129,8 +1130,9 @@ static int ks_wlan_set_scan(struct net_device *dev,
|
|||||||
if (wrqu->data.length == sizeof(struct iw_scan_req) &&
|
if (wrqu->data.length == sizeof(struct iw_scan_req) &&
|
||||||
wrqu->data.flags & IW_SCAN_THIS_ESSID) {
|
wrqu->data.flags & IW_SCAN_THIS_ESSID) {
|
||||||
req = (struct iw_scan_req *)extra;
|
req = (struct iw_scan_req *)extra;
|
||||||
priv->scan_ssid_len = req->essid_len;
|
len = min_t(int, req->essid_len, IW_ESSID_MAX_SIZE);
|
||||||
memcpy(priv->scan_ssid, req->essid, priv->scan_ssid_len);
|
priv->scan_ssid_len = len;
|
||||||
|
memcpy(priv->scan_ssid, req->essid, len);
|
||||||
} else {
|
} else {
|
||||||
priv->scan_ssid_len = 0;
|
priv->scan_ssid_len = 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user