Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: 6lowpan: add missing l2cap_chan_lock() 

l2cap_chan_close() needs to be called in l2cap_chan_lock(), otherwise
l2cap_le_sig_cmd() etc. may run concurrently.

Add missing locks around l2cap_chan_close().

Fixes: 6b8d4a6a03 ("Bluetooth: 6LoWPAN: Use connected oriented channel instead of fixed one")
Signed-off-by: Pauli Virtanen <pav@iki.fi>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Pauli Virtanen 2025-11-03 20:29:50 +02:00 committed by Luiz Augusto von Dentz
parent 98454bc812
commit 15f32cabf4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/6lowpan.c
View File

@ -927,7 +927,9 @@ static int bt_6lowpan_disconnect(struct l2cap_conn *conn, u8 dst_type)
BT_DBG("peer %p chan %p", peer, peer->chan); BT_DBG("peer %p chan %p", peer, peer->chan);
l2cap_chan_lock(peer->chan);
l2cap_chan_close(peer->chan, ENOENT); l2cap_chan_close(peer->chan, ENOENT);
l2cap_chan_unlock(peer->chan);
return 0; return 0;
} }
@ -1089,7 +1091,9 @@ static void do_enable_set(struct work_struct *work)
mutex_lock(&set_lock); mutex_lock(&set_lock);
if (listen_chan) { if (listen_chan) {
l2cap_chan_lock(listen_chan);
l2cap_chan_close(listen_chan, 0); l2cap_chan_close(listen_chan, 0);
l2cap_chan_unlock(listen_chan);
l2cap_chan_put(listen_chan); l2cap_chan_put(listen_chan);
} }
@ -1148,7 +1152,9 @@ static ssize_t lowpan_control_write(struct file *fp,
mutex_lock(&set_lock); mutex_lock(&set_lock);
if (listen_chan) { if (listen_chan) {
l2cap_chan_lock(listen_chan);
l2cap_chan_close(listen_chan, 0); l2cap_chan_close(listen_chan, 0);
l2cap_chan_unlock(listen_chan);
l2cap_chan_put(listen_chan); l2cap_chan_put(listen_chan);
listen_chan = NULL; listen_chan = NULL;
} }
@ -1310,7 +1316,9 @@ static void __exit bt_6lowpan_exit(void)
debugfs_remove(lowpan_control_debugfs); debugfs_remove(lowpan_control_debugfs);
if (listen_chan) { if (listen_chan) {
l2cap_chan_lock(listen_chan);
l2cap_chan_close(listen_chan, 0); l2cap_chan_close(listen_chan, 0);
l2cap_chan_unlock(listen_chan);
l2cap_chan_put(listen_chan); l2cap_chan_put(listen_chan);
} }