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

Commit 3af37302 authored by Stefano Panella's avatar Stefano Panella Committed by David Vrabel
Browse files

uwb: remove beacon cache entry after calling uwb_notify() 



Removing the beacon cache entry from a uwb_dev can cause an oops if the
bce is released before the call to uwb_notify().

Signed-off-by: default avatarStefano Panella <stefano.panella@csr.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
parent a01777ec

drivers/uwb/beacon.c

+0 −2
Original line number Diff line number Diff line
@@ -289,8 +289,6 @@ void uwb_beca_purge(struct uwb_rc *rc) 
		expires = bce->ts_jiffies + msecs_to_jiffies(beacon_timeout_ms);

		if (time_after(jiffies, expires)) {

			uwbd_dev_offair(bce);

			list_del(&bce->node);

			uwb_bce_put(bce);

		}

	}

	mutex_unlock(&rc->uwb_beca.mutex);

drivers/uwb/lc-dev.c

+2 −0
Original line number Diff line number Diff line
@@ -375,6 +375,8 @@ int __uwb_dev_offair(struct uwb_dev *uwb_dev, struct uwb_rc *rc) 
		 rc ? rc->uwb_dev.dev.parent->bus->name : "n/a",

		 rc ? dev_name(rc->uwb_dev.dev.parent) : "");

	uwb_dev_rm(uwb_dev);

	list_del(&uwb_dev->bce->node);

	uwb_bce_put(uwb_dev->bce);

	uwb_dev_put(uwb_dev);	/* for the creation in _onair() */



	return 0;