Re: [RFC] Bluetooth: Lock l2cap chan in sockopt
From: Mat Martineau <hidden>
Date: 2012-06-08 18:02:47
Andrei - On Wed, 6 Jun 2012, Andrei Emeltchenko wrote:
From: Andrei Emeltchenko <redacted> Signed-off-by: Andrei Emeltchenko <redacted>
Commit message is quite short :) (I know, it's just an RFC)
quoted hunk ↗ jump to hunk
--- net/bluetooth/l2cap_sock.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index a4bb27e..373ce9c 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c@@ -275,6 +275,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __usif (get_user(len, optlen)) return -EFAULT; + l2cap_chan_lock(chan); lock_sock(sk); switch (optname) {@@ -345,6 +346,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us} release_sock(sk); + l2cap_chan_unlock(chan); + return err; }@@ -367,6 +370,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, chif (get_user(len, optlen)) return -EFAULT; + l2cap_chan_lock(chan); lock_sock(sk); switch (optname) {@@ -442,6 +446,8 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch} release_sock(sk); + l2cap_chan_unlock(chan); + return err; }@@ -471,6 +477,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __usBT_DBG("sk %p", sk); + l2cap_chan_lock(chan); lock_sock(sk); switch (optname) {@@ -556,6 +563,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us} release_sock(sk); + l2cap_chan_unlock(chan); + return err; }@@ -577,6 +586,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, chif (level != SOL_BLUETOOTH) return -ENOPROTOOPT; + l2cap_chan_lock(chan); lock_sock(sk); switch (optname) {@@ -729,6 +739,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch} release_sock(sk); + l2cap_chan_unlock(chan); + return err; } -- 1.7.9.5
Code looks good to me. In the near future, BT_CHANNEL_POLICY will call in to the L2CAP core to do channel moves, but I think it helps to already have the lock held in that case. -- Mat Martineau Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum