From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 25 Sep 2013 10:26:05 +0000 (+0300)
Subject: Bluetooth: Clean up socket locking in l2cap_sock_recvmsg
X-Git-Tag: accepted/tizen/common/20141203.182822~1141^2~225^2~24^2~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=970871bc9cb2f5f783cb7cca31ff223c44662327;p=platform%2Fkernel%2Flinux-arm64.git

Bluetooth: Clean up socket locking in l2cap_sock_recvmsg

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 <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index ad95b42..c85537c 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -805,8 +805,8 @@ 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;
+		err = 0;
+		goto done;
 	}
 
 	release_sock(sk);