bluetooth: Fix use-before-initiailized var.
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Apr 2011 20:03:02 +0000 (13:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Apr 2011 20:03:02 +0000 (13:03 -0700)
net/bluetooth/l2cap_core.c: In function ‘l2cap_recv_frame’:
net/bluetooth/l2cap_core.c:3612:15: warning: ‘sk’ may be used uninitialized in this function
net/bluetooth/l2cap_core.c:3612:15: note: ‘sk’ was declared here

Actually the problem is in the inline function l2cap_data_channel(), we
branch to the label 'done' which tests 'sk' before we set it to anything.

Initialize it to NULL to fix this.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/bluetooth/l2cap_core.c

index d47de2b04b2e70217f98c79693919547006fc34d..8cfa2a663028900e6b0fe8107398faeb9af39d37 100644 (file)
@@ -3609,7 +3609,7 @@ drop:
 static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk_buff *skb)
 {
        struct l2cap_chan *chan;
-       struct sock *sk;
+       struct sock *sk = NULL;
        struct l2cap_pinfo *pi;
        u16 control;
        u8 tx_seq;