Bluetooth: Hack: Don't dereference null pointer.
authorNick Pelly <npelly@google.com>
Thu, 8 Apr 2010 23:23:32 +0000 (16:23 -0700)
committerNick Pelly <npelly@google.com>
Thu, 8 Apr 2010 23:36:11 +0000 (16:36 -0700)
This avoids the S305 panic during incoming connection.

S305 sends PSM 25 L2CAP connection request before the L2CAP info response.
When we receive that info response we crash on null pointer here.

Bug: 2127637
Change-Id: Ib637516251f46fa9a9c87ac015dc2f27df5a27fd
Signed-off-by: Nick Pelly <npelly@google.com>
net/bluetooth/l2cap.c

index 4529e99b2940dfa2b12997e9a19a6d1f23bc58eb..424712ca28ba1623a79becab0904dc538df93b2a 100644 (file)
@@ -464,7 +464,8 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
                                        struct sock *parent = bt_sk(sk)->parent;
                                        rsp.result = cpu_to_le16(L2CAP_CR_PEND);
                                        rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
-                                       parent->sk_data_ready(parent, 0);
+                                       if (parent)
+                                               parent->sk_data_ready(parent, 0);
 
                                } else {
                                        sk->sk_state = BT_CONFIG;