Skip to content

Commit 1595eff

Browse files
committed
Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp}
jira VULN-168834 cve CVE-2023-53827 commit-author Luiz Augusto von Dentz <[email protected]> commit a2a9339 Similar to commit d0be834 ("Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put"), just use l2cap_chan_hold_unless_zero to prevent referencing a channel that is about to be destroyed. Cc: [email protected] Signed-off-by: Luiz Augusto von Dentz <[email protected]> Signed-off-by: Min Li <[email protected]> (cherry picked from commit a2a9339) Signed-off-by: Brett Mastbergen <[email protected]>
1 parent 0e8975a commit 1595eff

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

net/bluetooth/l2cap_core.c

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4632,33 +4632,27 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,
46324632

46334633
BT_DBG("scid 0x%4.4x dcid 0x%4.4x", scid, dcid);
46344634

4635-
mutex_lock(&conn->chan_lock);
4636-
4637-
chan = __l2cap_get_chan_by_scid(conn, dcid);
4635+
chan = l2cap_get_chan_by_scid(conn, dcid);
46384636
if (!chan) {
4639-
mutex_unlock(&conn->chan_lock);
46404637
cmd_reject_invalid_cid(conn, cmd->ident, dcid, scid);
46414638
return 0;
46424639
}
46434640

4644-
l2cap_chan_hold(chan);
4645-
l2cap_chan_lock(chan);
4646-
46474641
rsp.dcid = cpu_to_le16(chan->scid);
46484642
rsp.scid = cpu_to_le16(chan->dcid);
46494643
l2cap_send_cmd(conn, cmd->ident, L2CAP_DISCONN_RSP, sizeof(rsp), &rsp);
46504644

46514645
chan->ops->set_shutdown(chan);
46524646

4647+
mutex_lock(&conn->chan_lock);
46534648
l2cap_chan_del(chan, ECONNRESET);
4649+
mutex_unlock(&conn->chan_lock);
46544650

46554651
chan->ops->close(chan);
46564652

46574653
l2cap_chan_unlock(chan);
46584654
l2cap_chan_put(chan);
46594655

4660-
mutex_unlock(&conn->chan_lock);
4661-
46624656
return 0;
46634657
}
46644658

@@ -4678,33 +4672,27 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn,
46784672

46794673
BT_DBG("dcid 0x%4.4x scid 0x%4.4x", dcid, scid);
46804674

4681-
mutex_lock(&conn->chan_lock);
4682-
4683-
chan = __l2cap_get_chan_by_scid(conn, scid);
4675+
chan = l2cap_get_chan_by_scid(conn, scid);
46844676
if (!chan) {
46854677
mutex_unlock(&conn->chan_lock);
46864678
return 0;
46874679
}
46884680

4689-
l2cap_chan_hold(chan);
4690-
l2cap_chan_lock(chan);
4691-
46924681
if (chan->state != BT_DISCONN) {
46934682
l2cap_chan_unlock(chan);
46944683
l2cap_chan_put(chan);
4695-
mutex_unlock(&conn->chan_lock);
46964684
return 0;
46974685
}
46984686

4687+
mutex_lock(&conn->chan_lock);
46994688
l2cap_chan_del(chan, 0);
4689+
mutex_unlock(&conn->chan_lock);
47004690

47014691
chan->ops->close(chan);
47024692

47034693
l2cap_chan_unlock(chan);
47044694
l2cap_chan_put(chan);
47054695

4706-
mutex_unlock(&conn->chan_lock);
4707-
47084696
return 0;
47094697
}
47104698

0 commit comments

Comments
 (0)