Linux bluetooth development
 help / color / mirror / Atom feed
From: Gustavo Padovan <gustavo@padovan.org>
To: linux-bluetooth@vger.kernel.org
Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Subject: [RFC -v2 09/16] Bluetooth: lock socket in defer_cb call
Date: Fri, 21 Dec 2012 16:10:52 -0200	[thread overview]
Message-ID: <1356113459-7932-10-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1356113459-7932-1-git-send-email-gustavo@padovan.org>

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Since we removed the lock around the ops->defer() call inside
l2cap_core.c we need now to protect the defer_cb call.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 net/bluetooth/l2cap_sock.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 9cd6fba..6a95d37 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1096,11 +1096,15 @@ static void l2cap_sock_ready_cb(struct l2cap_chan *chan)
 
 static void l2cap_sock_defer_cb(struct l2cap_chan *chan)
 {
-	struct sock *sk = chan->data;
-	struct sock *parent = bt_sk(sk)->parent;
+	struct sock *parent, *sk = chan->data;
+
+	lock_sock(sk);
 
+	parent = bt_sk(sk)->parent;
 	if (parent)
 		parent->sk_data_ready(parent, 0);
+
+	release_sock(sk);
 }
 
 static struct l2cap_ops l2cap_chan_ops = {
-- 
1.8.0.2


  parent reply	other threads:[~2012-12-21 18:10 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-21 18:10 [RFC -v2 00/16] Completely remove socket dependency from l2cap_core.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 01/16] Bluetooth: Add src and dst info to struct l2cap_chan Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 02/16] Bluetooth: Remove sk_sndtimeo from l2cap_core.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 03/16] Bluetooth: extend state_change() call to report errors too Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 04/16] Bluetooth: add l2cap_state_change_and_error() Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 05/16] Bluetooth: Add missing braces to an "else if" Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 06/16] Bluetooth: use l2cap_chan_ready() instead of duplicate code Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 07/16] Bluetooth: duplicate DEFER_SETUP flag on l2cap_chan Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 08/16] Bluetooth: Improving locking in l2cap_conn_start() Gustavo Padovan
2012-12-21 18:10 ` Gustavo Padovan [this message]
2012-12-21 18:10 ` [RFC -v2 10/16] Bluetooth: Remove socket lock from state_change() in l2cap_core Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 11/16] Bluetooth: remove parent socket usage from l2cap_core.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 12/16] Bluetooth: Use abstract chan->data in comparison Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 13/16] Bluetooth: Move l2cap_wait_ack() to l2cap_sock.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 14/16] Bluetooth: Create l2cap->ops->resume() Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 15/16] Bluetooth: Create l2cap->ops->set_shutdown() Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 16/16] Bluetooth: Remove sk member from struct l2cap_chan 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=1356113459-7932-10-git-send-email-gustavo@padovan.org \
    --to=gustavo@padovan.org \
    --cc=gustavo.padovan@collabora.co.uk \
    --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