[PATCH] Bluetooth: l2cap: fix a NULL pointer oops in l2cap_conn_start

[PATCH] Bluetooth: l2cap: fix a NULL pointer oops in l2cap_conn_start

[Feng Tang]

When I try to setup a PAND connection between the sever and client,
the server side always get a NULL pointer oops in l2cap_conn_start()
right after the client run "pand -r PANU -c sever_addr". Don't have
the boot log as it's an immediate hang.

Simply adding this "if (parent)" check will fix it, don't know whether
it fix the real problem. Anyway, send it as a hint.

Signed-off-by: Feng Tang <feng.tang@intel.com>
---
 net/bluetooth/l2cap.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 675614e..150366f 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -583,8 +583,9 @@ 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;
 					rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
-- 
1.7.0.4

Re: [PATCH] Bluetooth: l2cap: fix a NULL pointer oops in l2cap_conn_start

[Gustavo F. Padovan]

Hi Feng,

* Feng Tang <feng.tang@intel.com> [2011-02-22 16:03:24 +0800]:

> When I try to setup a PAND connection between the sever and client,
> the server side always get a NULL pointer oops in l2cap_conn_start()
> right after the client run "pand -r PANU -c sever_addr". Don't have
> the boot log as it's an immediate hang.
> 
> Simply adding this "if (parent)" check will fix it, don't know whether
> it fix the real problem. Anyway, send it as a hint.

I pushed a proper fix for this issues, see the bluetooth-2.6 tree.

-- 
Gustavo F. Padovan
http://profusion.mobi