diff options
| author | Andrei Emeltchenko | 2012-02-14 14:12:57 +0100 |
|---|---|---|
| committer | Johan Hedberg | 2012-02-16 14:15:08 +0100 |
| commit | 7ddb6e0f3f7aa265c905b947e9ac4ab9562e52f2 (patch) | |
| tree | c284114f6d8a77aecf0a00f8aae1ab54315597b7 /net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | kernel-qcow2-linux-7ddb6e0f3f7aa265c905b947e9ac4ab9562e52f2.tar.gz kernel-qcow2-linux-7ddb6e0f3f7aa265c905b947e9ac4ab9562e52f2.tar.xz kernel-qcow2-linux-7ddb6e0f3f7aa265c905b947e9ac4ab9562e52f2.zip | |
Bluetooth: Do not dereference zero sk
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 16360298590f..138fe3446678 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/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) |