summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDesmond Cheong Zhi Xi <desmondcheongzx@gmail.com>2021-09-03 05:13:05 +0200
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2021-09-04 01:33:10 +0200
commitf4712fa993f688d0a48e0c28728fcdeb88c1ea58 (patch)
tree6f30a1ac4fa8340bf868fe7111dac0b876399087
parentBluetooth: btusb: Add support for IMC Networks Mediatek Chip(MT7921) (diff)
downloadlinux-f4712fa993f688d0a48e0c28728fcdeb88c1ea58.tar.xz
linux-f4712fa993f688d0a48e0c28728fcdeb88c1ea58.zip
Bluetooth: call sock_hold earlier in sco_conn_del
In sco_conn_del, conn->sk is read while holding on to the sco_conn.lock to avoid races with a socket that could be released concurrently. However, in between unlocking sco_conn.lock and calling sock_hold, it's possible for the socket to be freed, which would cause a use-after-free write when sock_hold is finally called. To fix this, the reference count of the socket should be increased while the sco_conn.lock is still held. Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-rw-r--r--net/bluetooth/sco.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index b62c91c627e2..4a057f99b60a 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -187,10 +187,11 @@ static void sco_conn_del(struct hci_conn *hcon, int err)
/* Kill socket */
sco_conn_lock(conn);
sk = conn->sk;
+ if (sk)
+ sock_hold(sk);
sco_conn_unlock(conn);
if (sk) {
- sock_hold(sk);
lock_sock(sk);
sco_sock_clear_timer(sk);
sco_chan_del(sk, err);