From 4c4c8231b99bc68ed018784a602318a47f0a3131 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Tue, 14 Feb 2012 15:12:57 +0200 Subject: [PATCH] --- yaml --- r: 290957 b: refs/heads/master c: 7ddb6e0f3f7aa265c905b947e9ac4ab9562e52f2 h: refs/heads/master i: 290955: cf15cfa37bc1979e19c6a7412c38489663f802c1 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_sock.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7b7ec53b511a..0ab26fa58055 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46479e698530b8197d601a23317b7c7654195338 +refs/heads/master: 7ddb6e0f3f7aa265c905b947e9ac4ab9562e52f2 diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c index 16360298590f..138fe3446678 100644 --- a/trunk/net/bluetooth/l2cap_sock.c +++ b/trunk/net/bluetooth/l2cap_sock.c @@ -795,7 +795,7 @@ static void l2cap_sock_kill(struct sock *sk) static int l2cap_sock_shutdown(struct socket *sock, int how) { struct sock *sk = sock->sk; - struct l2cap_chan *chan = l2cap_pi(sk)->chan; + struct l2cap_chan *chan; int err = 0; BT_DBG("sock %p, sk %p", sock, sk); @@ -803,6 +803,8 @@ static int l2cap_sock_shutdown(struct socket *sock, int how) if (!sk) return 0; + chan = l2cap_pi(sk)->chan; + lock_sock(sk); if (!sk->sk_shutdown) { if (chan->mode == L2CAP_MODE_ERTM)