Commit 2baea85d authored by Dean Jenkins's avatar Dean Jenkins Committed by Marcel Holtmann

Bluetooth: L2CAP ERTM shutdown protect sk and chan

During execution of l2cap_sock_shutdown() which might
sleep, the sk and chan structures can be in an unlocked
condition which potentially allows the structures to be
freed by other running threads. Therefore, there is a
possibility of a malfunction or memory reuse after being
freed.

Keep the sk and chan structures alive during the
execution of l2cap_sock_shutdown() by using their
respective hold and put functions. This allows the structures
to be freeable at the end of l2cap_sock_shutdown().
Signed-off-by: default avatarKautuk Consul <Kautuk_Consul@mentor.com>
Signed-off-by: default avatarDean Jenkins <Dean_Jenkins@mentor.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d10270ce
...@@ -1098,7 +1098,12 @@ static int l2cap_sock_shutdown(struct socket *sock, int how) ...@@ -1098,7 +1098,12 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)
if (!sk) if (!sk)
return 0; return 0;
/* prevent sk structure from being freed whilst unlocked */
sock_hold(sk);
chan = l2cap_pi(sk)->chan; chan = l2cap_pi(sk)->chan;
/* prevent chan structure from being freed whilst unlocked */
l2cap_chan_hold(chan);
conn = chan->conn; conn = chan->conn;
BT_DBG("chan %p state %s", chan, state_to_string(chan->state)); BT_DBG("chan %p state %s", chan, state_to_string(chan->state));
...@@ -1134,6 +1139,9 @@ static int l2cap_sock_shutdown(struct socket *sock, int how) ...@@ -1134,6 +1139,9 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)
if (conn) if (conn)
mutex_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
l2cap_chan_put(chan);
sock_put(sk);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment