fix error paths in cfg80211_wext_siwscan()
Subsystems (3)
PATCH 1/1 fix error paths in cfg80211_wext_siwscan()
The new code calls kfree(creq) and on the wreq->essid_len > IEEE80211_MAX_SSID_LEN case it also unlocks the rdev lock.
This was found with a static checker and compile tested only. :/
net/wireless/scan.c +6 -3
@@ -685,7 +685,7 @@ int cfg80211_wext_siwscan(struct net_dev/* No channels found? */ if (!i) { err = -EINVAL ; - goto out; + goto out1; }/* Set real number of channels specified in creq->channels[] */
@@ -694,8 +694,10 @@ int cfg80211_wext_siwscan(struct net_dev/* translate "Scan for SSID" request */ if (wreq) {if (wrqu->data.flags &IW_SCAN_THIS_ESSID ) { -if (wreq->essid_len >IEEE80211_MAX_SSID_LEN ) -return -EINVAL ; +if (wreq->essid_len >IEEE80211_MAX_SSID_LEN ) { + err = -EINVAL ; + goto out1; + }memcpy (creq->ssids[0 ].ssid, wreq->essid, wreq->essid_len); creq->ssids[0 ].ssid_len = wreq->essid_len; }
@@ -705,6 +707,7 @@ int cfg80211_wext_siwscan(struct net_dev rdev->scan_req = creq; err = rdev->ops->scan (wiphy, dev, creq); +out1:if (err) { rdev->scan_req =NULL ;kfree (creq);
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 cfg80211: fix error path in cfg80211_wext_siwscan
If there's an invalid channel or SSID, the code leaks the scan request. Always free the scan request, unless it was successfully given to the driver.
---
I kinda prefer this, thoughts?
net/wireless/scan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/wireless/scan.c +9 -4
@@ -601,7 +601,7 @@ int cfg80211_wext_siwscan(struct net_devstruct cfg80211_registered_device *rdev;struct wiphy *wiphy;struct iw_scan_req *wreq =NULL ; -struct cfg80211_scan_request *creq; +struct cfg80211_scan_request *creq =NULL ;int i, err, n_channels =0 ;enum ieee80211_band band;
@@ -694,8 +694,10 @@ int cfg80211_wext_siwscan(struct net_dev/* translate "Scan for SSID" request */ if (wreq) {if (wrqu->data.flags &IW_SCAN_THIS_ESSID ) { -if (wreq->essid_len >IEEE80211_MAX_SSID_LEN ) -return -EINVAL ; +if (wreq->essid_len >IEEE80211_MAX_SSID_LEN ) { + err = -EINVAL ; + goto out; + }memcpy (creq->ssids[0 ].ssid, wreq->essid, wreq->essid_len); creq->ssids[0 ].ssid_len = wreq->essid_len; }
@@ -707,12 +709,15 @@ int cfg80211_wext_siwscan(struct net_dev err = rdev->ops->scan (wiphy, dev, creq);if (err) { rdev->scan_req =NULL ; -kfree (creq); +/* creq will be freed below */ }else {nl80211_send_scan_start (rdev, dev); +/* creq now owned by driver */ + creq =NULL ;dev_hold (dev); } out: +kfree (creq);cfg80211_unlock_rdev (rdev);return err; }
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Dan Carpenter
Acked-byRe: [PATCH] cfg80211: fix error path in cfg80211_wext_siwscan
Quoted 9 lines · Johannes Berg
If there's an invalid channel or SSID, the code leaks the scan request. Always free the scan request, unless it was successfully given to the driver.
Reported-by Dan Carpenter <[email protected]>Signed-off-by Johannes Berg <[email protected]>---
I kinda prefer this, thoughts?
Looks good.
regards,
dan carpenter
Quoted 35 lines
net/wireless/scan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)net/wireless/scan.c +6
-4@@ -601,7 +601,7 @@ int cfg80211_wext_siwscan(struct net_devstruct cfg80211_registered_device *rdev;struct wiphy *wiphy;struct iw_scan_req *wreq =NULL ; -struct cfg80211_scan_request *creq; +struct cfg80211_scan_request *creq =NULL ;int i, err, n_channels =0 ;enum ieee80211_band band;@@ -694,8 +694,10 @@ int cfg80211_wext_siwscan(struct net_dev/* translate "Scan for SSID" request */ if (wreq) {if (wrqu->data.flags &IW_SCAN_THIS_ESSID ) { -if (wreq->essid_len >IEEE80211_MAX_SSID_LEN ) -return -EINVAL ; +if (wreq->essid_len >IEEE80211_MAX_SSID_LEN ) { + err = -EINVAL ; + goto out; + }memcpy (creq->ssids[0 ].ssid, wreq->essid, wreq->essid_len); creq->ssids[0 ].ssid_len = wreq->essid_len; }@@ -707,12 +709,15 @@ int cfg80211_wext_siwscan(struct net_dev err = rdev->ops->scan (wiphy, dev, creq);if (err) { rdev->scan_req =NULL ; -kfree (creq); +/* creq will be freed below */ }else {
net/wireless/scan.c int cfg80211_wext_siwscan(struct net_dev · line 723
Quoted 10 lines
net/wireless/scan.c +3
-0nl80211_send_scan_start (rdev, dev); +/* creq now owned by driver */ + creq =NULL ;dev_hold (dev); } out: +kfree (creq);cfg80211_unlock_rdev (rdev);return err; }
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html