commit c29d2444170a4e0709331e357a2738a02666a633
author Johan Hedberg <johan.hedberg@intel.com> Mon Jun 16 19:25:14 2014 +0300
committer Marcel Holtmann <marcel@holtmann.org> Thu Jul 03 17:42:42 2014 +0200
tree bacd0f2c19ec66de5fb1ed868957a3b8a54ff180
parent 65cc2b49db63adf1455a9783234383fbec5b8314

Bluetooth: Fix missing NULL check for smp_chan_create() return value

The smp_chan_create function may return NULL, e.g. in the case of memory
allocation failure, so we always need to check for this.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

net/bluetooth/smp.c

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index e33a982..1f4ed1e 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -888,6 +888,8 @@
 		return 0;
 
 	smp = smp_chan_create(conn);
+	if (!smp)
+		return SMP_UNSPECIFIED;
 
 	skb_pull(skb, sizeof(*rp));