From: Zygo Blaxell <zblaxell@satsuki.furryterror.org>
Date: Tue, 8 May 2012 01:00:10 +0000 (-0400)
Subject: zygo: net/bluetooth: avoid NULL pointer dereference, try 3: fix it, don't just compla... 
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c91c5ee123577c5f736bbd864b2747caec281df;p=linux

zygo: net/bluetooth: avoid NULL pointer dereference, try 3: fix it, don't just complain about it
---

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index e7e3d884b3f4..458a6f7e38b8 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -376,9 +376,13 @@ static void __sco_sock_close(struct sock *sk)
 			sk->sk_state = BT_DISCONN;
 			sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
 			BT_DBG("BT_CONNECTED -> BT_DISCONN sco_pi(sk) %p", sco_pi(sk));
-			BT_DBG("BT_DISCONN sco_pi(sk)->conn %p", sco_pi(sk)->conn);
-			BT_DBG("BT_DISCONN sco_pi(sk)->conn->hcon %p", sco_pi(sk)->conn->hcon);
+			if (!sco_pi(sk)) break;
+			BT_DBG("BT_CONNECTED -> BT_DISCONN sco_pi(sk)->conn %p", sco_pi(sk)->conn);
+			if (!sco_pi(sk)->conn) break;
+			BT_DBG("BT_CONNECTED -> BT_DISCONN sco_pi(sk)->conn->hcon %p", sco_pi(sk)->conn->hcon);
+			if (!sco_pi(sk)->conn->hcon) break;
 			hci_conn_put(sco_pi(sk)->conn->hcon);
+			BT_DBG("BT_CONNECTED -> BT_DISCONN sco_pi(sk)->conn->hcon = NULL");
 			sco_pi(sk)->conn->hcon = NULL;
 		} else
 			sco_chan_del(sk, ECONNRESET);