Linux bluetooth development
 help / color / mirror / Atom feed
From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 2/7] Bluetooth: Clean up socket locking in l2cap_sock_recvmsg
Date: Wed, 25 Sep 2013 13:26:05 +0300	[thread overview]
Message-ID: <1380104770-8022-3-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1380104770-8022-1-git-send-email-johan.hedberg@gmail.com>

From: Johan Hedberg <johan.hedberg@intel.com>

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>
---
 net/bluetooth/l2cap_sock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);
-- 
1.8.3.1


  parent reply	other threads:[~2013-09-25 10:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-25 10:26 [PATCH v2 0/7] Bluetooth: Cleanups and LE advertising support johan.hedberg
2013-09-25 10:26 ` [PATCH v2 1/7] Bluetooth: Add clarifying comment to bt_sock_wait_state() johan.hedberg
2013-09-25 10:26 ` johan.hedberg [this message]
2013-09-25 10:30   ` [PATCH v2 2/7] Bluetooth: Clean up socket locking in l2cap_sock_recvmsg Marcel Holtmann
2013-09-25 10:26 ` [PATCH v2 3/7] Bluetooth: Fix busy return for mgmt_set_powered in some cases johan.hedberg
2013-09-25 10:26 ` [PATCH v2 4/7] Bluetooth: Move mgmt response convenience functions to a better location johan.hedberg
2013-09-25 10:26 ` [PATCH v2 5/7] Bluetooth: Use async request for LE enable/disable johan.hedberg
2013-09-25 10:26 ` [PATCH v2 6/7] Bluetooth: Add new mgmt setting for LE advertising johan.hedberg
2013-09-25 10:26 ` [PATCH v2 7/7] Bluetooth: Add new mgmt_set_advertising command johan.hedberg
2013-09-25 10:31   ` Marcel Holtmann
2013-09-25 17:30   ` Gustavo Padovan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1380104770-8022-3-git-send-email-johan.hedberg@gmail.com \
    --to=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox