summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-25 13:03:02 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-25 13:03:02 -0700
commitbf734843120b905bacc3d24c88d7455ae70bf6e1 (patch)
tree280e72e3d33b90e302485875b82b520e13c89513
parent345578d97c549995ddbcc178f16f710602cc06bb (diff)
downloadlinux-3.10-bf734843120b905bacc3d24c88d7455ae70bf6e1.tar.gz
linux-3.10-bf734843120b905bacc3d24c88d7455ae70bf6e1.tar.bz2
linux-3.10-bf734843120b905bacc3d24c88d7455ae70bf6e1.zip
bluetooth: Fix use-before-initiailized var.
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>
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d47de2b04b2..8cfa2a66302 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -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;