Re: [PATCH 2/8] Bluetooth: Clean up socket locking in l2cap_sock_recvmsg
From: Marcel Holtmann <marcel@holtmann.org>
Date: 2013-09-24 18:16:12
Hi Johan,
quoted hunk ↗ jump to hunk
This patch cleans up the locking login in l2cap_sock_recvmsg by pairing up each lock_sock call with a release_sock call. The function already has a "done" label that handles releasing the socket and returning from the function so the fix is rather simple. Signed-off-by: Johan Hedberg <redacted> --- net/bluetooth/l2cap_sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index ad95b42..5853c1e 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c@@ -795,7 +795,7 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock,{ struct sock *sk = sock->sk; struct l2cap_pinfo *pi = l2cap_pi(sk); - int err; + int err = 0; lock_sock(sk);@@ -805,8 +805,7 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock,pi->chan->state = BT_CONFIG; __l2cap_connect_rsp_defer(pi->chan); - release_sock(sk); - return 0;
can we just do err = 0; here instead of declaring it global.
+ goto done; } release_sock(sk);
Regards Marcel