Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b4670ff authored by Jesper Juhl's avatar Jesper Juhl Committed by John W. Linville
Browse files

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



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: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3bff1865

net/wireless/scan.c

+2 −3
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ EXPORT_SYMBOL(cfg80211_sched_scan_stopped); 
int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,

			       bool driver_initiated)

{

	int err;

	struct net_device *dev;



	ASSERT_RDEV_LOCK(rdev);
@@ -143,7 +142,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, 
	dev = rdev->sched_scan_req->dev;



	if (!driver_initiated) {

		err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev);

		int err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev);

		if (err)

			return err;

	}
@@ -153,7 +152,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, 
	kfree(rdev->sched_scan_req);

	rdev->sched_scan_req = NULL;



	return err;

	return 0;

}



static void bss_release(struct kref *ref)