lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net, wireless: Don't return uninitialized in __cfg80211_stop_sched_scan()

Browse Source 
If the 'driver_initiated' function argument to
__cfg80211_stop_sched_scan() is not 0 then we'll return an
uninitialized 'err' from the function.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Jesper Juhl
2011-06-29 22:49:33 +02:00
committed by John W. Linville
parent 3bff186518
commit 3b4670ffe7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/wireless/scan.c
View File

@@ -132,7 +132,6 @@ EXPORT_SYMBOL(cfg80211_sched_scan_stopped);
int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
bool driver_initiated) bool driver_initiated)
{ {
int err;
struct net_device *dev; struct net_device *dev;
ASSERT_RDEV_LOCK(rdev); ASSERT_RDEV_LOCK(rdev);
@@ -143,7 +142,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
dev = rdev->sched_scan_req->dev; dev = rdev->sched_scan_req->dev;
if (!driver_initiated) { if (!driver_initiated) {
err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev); int err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev);
if (err) if (err)
return err; return err;
} }
@@ -153,7 +152,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
kfree(rdev->sched_scan_req); kfree(rdev->sched_scan_req);
rdev->sched_scan_req = NULL; rdev->sched_scan_req = NULL;
return err; return 0;
} }
static void bss_release(struct kref *ref) static void bss_release(struct kref *ref)