Skip to content

Commit b837f83

Browse files
committed
Bluetooth: L2CAP: Fix user-after-free
jira VULN-155527 cve CVE-2022-50386 commit-author Luiz Augusto von Dentz <luiz.von.dentz@intel.com> commit 35fcbc4 This uses l2cap_chan_hold_unless_zero() after calling __l2cap_get_chan_blah() to prevent the following trace: Bluetooth: l2cap_core.c:static void l2cap_chan_destroy(struct kref *kref) Bluetooth: chan 0000000023c4974d Bluetooth: parent 00000000ae861c08 ================================================================== BUG: KASAN: use-after-free in __mutex_waiter_is_first kernel/locking/mutex.c:191 [inline] BUG: KASAN: use-after-free in __mutex_lock_common kernel/locking/mutex.c:671 [inline] BUG: KASAN: use-after-free in __mutex_lock+0x278/0x400 kernel/locking/mutex.c:729 Read of size 8 at addr ffff888006a49b08 by task kworker/u3:2/389 Link: https://lore.kernel.org/lkml/20220622082716.478486-1-lee.jones@linaro.org Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Sungwoo Kim <iam@sung-woo.kim> (cherry picked from commit 35fcbc4) Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>
1 parent f02ba3a commit b837f83

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

net/bluetooth/l2cap_core.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4032,6 +4032,12 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn,
40324032
}
40334033
}
40344034

4035+
chan = l2cap_chan_hold_unless_zero(chan);
4036+
if (!chan) {
4037+
err = -EBADSLT;
4038+
goto unlock;
4039+
}
4040+
40354041
err = 0;
40364042

40374043
l2cap_chan_lock(chan);
@@ -4062,6 +4068,7 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn,
40624068
}
40634069

40644070
l2cap_chan_unlock(chan);
4071+
l2cap_chan_put(chan);
40654072

40664073
unlock:
40674074
mutex_unlock(&conn->chan_lock);

0 commit comments

Comments
 (0)