* [patch] fix error paths in cfg80211_wext_siwscan()
@ 2009-12-23 13:29 Dan Carpenter
2009-12-23 14:33 ` [PATCH] cfg80211: fix error path in cfg80211_wext_siwscan Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2009-12-23 13:29 UTC (permalink / raw)
To: Johannes Berg; +Cc: John W. Linville, David S. Miller, linux-wireless, netdev
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. :/
Signed-off-by: Dan Carpenter <error27@gmail.com>
--- orig/net/wireless/scan.c 2009-12-23 08:38:15.000000000 +0200
+++ devel/net/wireless/scan.c 2009-12-23 08:50:15.000000000 +0200
@@ -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);
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] cfg80211: fix error path in cfg80211_wext_siwscan
2009-12-23 13:29 [patch] fix error paths in cfg80211_wext_siwscan() Dan Carpenter
@ 2009-12-23 14:33 ` Johannes Berg
2009-12-23 14:46 ` Dan Carpenter
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2009-12-23 14:33 UTC (permalink / raw)
To: Dan Carpenter; +Cc: John W. Linville, David S. Miller, linux-wireless, netdev
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 <error27@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
I kinda prefer this, thoughts?
net/wireless/scan.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--- wireless-testing.orig/net/wireless/scan.c 2009-12-23 15:27:20.000000000 +0100
+++ wireless-testing/net/wireless/scan.c 2009-12-23 15:32:52.000000000 +0100
@@ -601,7 +601,7 @@ int cfg80211_wext_siwscan(struct net_dev
struct 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;
}
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] cfg80211: fix error path in cfg80211_wext_siwscan
2009-12-23 14:33 ` [PATCH] cfg80211: fix error path in cfg80211_wext_siwscan Johannes Berg
@ 2009-12-23 14:46 ` Dan Carpenter
0 siblings, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2009-12-23 14:46 UTC (permalink / raw)
To: Johannes Berg; +Cc: John W. Linville, David S. Miller, linux-wireless, netdev
On Wed, Dec 23, 2009 at 03:33:35PM +0100, Johannes Berg wrote:
> 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 <error27@gmail.com>
> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> I kinda prefer this, thoughts?
>
Looks good.
Acked-by: Dan Carpenter <error27@gmail.com>
regards,
dan carpenter
> net/wireless/scan.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> --- wireless-testing.orig/net/wireless/scan.c 2009-12-23 15:27:20.000000000 +0100
> +++ wireless-testing/net/wireless/scan.c 2009-12-23 15:32:52.000000000 +0100
> @@ -601,7 +601,7 @@ int cfg80211_wext_siwscan(struct net_dev
> struct 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;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-23 14:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-23 13:29 [patch] fix error paths in cfg80211_wext_siwscan() Dan Carpenter
2009-12-23 14:33 ` [PATCH] cfg80211: fix error path in cfg80211_wext_siwscan Johannes Berg
2009-12-23 14:46 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).