Skip to content

Commit 0a881c2

Browse files
committed
Bluetooth: L2CAP: Fix user-after-free
jira LE-4623 cve CVE-2022-50386 Rebuild_History Non-Buildable kernel-4.18.0-553.81.1.el8_10 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: Jonathan Maple <jmaple@ciq.com>
1 parent ab4b0b0 commit 0a881c2

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
@@ -4310,6 +4310,12 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn,
43104310
}
43114311
}
43124312

4313+
chan = l2cap_chan_hold_unless_zero(chan);
4314+
if (!chan) {
4315+
err = -EBADSLT;
4316+
goto unlock;
4317+
}
4318+
43134319
err = 0;
43144320

43154321
l2cap_chan_lock(chan);
@@ -4339,6 +4345,7 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn,
43394345
}
43404346

43414347
l2cap_chan_unlock(chan);
4348+
l2cap_chan_put(chan);
43424349

43434350
unlock:
43444351
mutex_unlock(&conn->chan_lock);

0 commit comments

Comments
 (0)