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

Commit cf223ff1 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

Bluetooth: delete a stray unlock 



commit df66499a1fab340c167250a5743931dc50d5f0fa upstream.

We used to take a lock in amp_physical_cfm() but then we moved it to
the caller function.  Unfortunately the unlock on this error path was
overlooked so it leads to a double unlock.

Fixes: a514b17f ("Bluetooth: Refactor locking in amp_physical_cfm")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0a5f3d3

net/bluetooth/l2cap_core.c

+1 −3
Original line number Diff line number Diff line
@@ -4918,10 +4918,8 @@ void __l2cap_physical_cfm(struct l2cap_chan *chan, int result) 
	BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d",

	       chan, result, local_amp_id, remote_amp_id);



	if (chan->state == BT_DISCONN || chan->state == BT_CLOSED) {

		l2cap_chan_unlock(chan);

	if (chan->state == BT_DISCONN || chan->state == BT_CLOSED)

		return;

	}



	if (chan->state != BT_CONNECTED) {

		l2cap_do_create(chan, result, local_amp_id, remote_amp_id);