Re: pull request: wireless-next-2.6 2011-04-25

[David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>]

From: David Miller <davem@davemloft.net>
Date: Mon, 25 Apr 2011 12:58:35 -0700 (PDT)

> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Mon, 25 Apr 2011 15:30:17 -0400
> 
>> Here is another big batch of updates intended for 2.6.40...
>> 
>> There is the usual huge batch of changes for ath9k, and iwlagn, a bunch
>> for ath9k_htc, rt2x00, and ath5k, a few more for mwifiex, and a handful
>> of others.  Also included is a big batch of Bluetooth updates as well.
>> 
>> Please let me know if there are problems!
> 
> Pulled, thanks a lot John.

I guess watching the build logs for new warnings is too old fashioned
for people, and besides Dave will do it for everyone anyways right?

And this one is a real bug too. :-/

I'll push this out to net-next-2.6 on top of the wireless-next pull,
but please be more mindful in the future.

--------------------
From bf734843120b905bacc3d24c88d7455ae70bf6e1 Mon Sep 17 00:00:00 2001
From: David S. Miller <davem@davemloft.net>
Date: Mon, 25 Apr 2011 13:03:02 -0700
Subject: [PATCH] bluetooth: Fix use-before-initiailized var.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d47de2b..8cfa2a6 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;
-- 
1.7.4.5