Thread (11 messages) 11 messages, 5 authors, 2012-03-02

Re: [PATCH] Bluetooth: Silence static checker warning.

From: Andrei Emeltchenko <hidden>
Date: 2012-02-29 20:45:53
Also in: kernel-janitors, linux-bluetooth, lkml

Hi Santosh,

On Wed, Feb 29, 2012 at 7:06 PM, santosh nayak
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Santosh Nayak <redacted>

Silencing Static checker warning.
1. Endian warning
2. variable dereferenced before check 'sk' .

Signed-off-by: Santosh Nayak <redacted>
---
 net/bluetooth/l2cap_sock.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 401d942..d206321 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -82,7 +82,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
       }

       if (la.l2_cid)
-               err = l2cap_add_scid(chan, la.l2_cid);
+               err = l2cap_add_scid(chan, __le16_to_cpu(la.l2_cid));
       else
               err = l2cap_add_psm(chan, &la.l2_bdaddr, la.l2_psm);
@@ -123,7 +123,8 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
       if (la.l2_cid && la.l2_psm)
               return -EINVAL;

-       err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr);
+       err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
+                               &la.l2_bdaddr);
       if (err)
               goto done;
@@ -795,7 +796,7 @@ static void l2cap_sock_kill(struct sock *sk)
 static int l2cap_sock_shutdown(struct socket *sock, int how)
 {
       struct sock *sk = sock->sk;
-       struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+       struct l2cap_chan *chan;
       int err = 0;

       BT_DBG("sock %p, sk %p", sock, sk);
@@ -803,6 +804,8 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)
       if (!sk)
               return 0;

+       chan = l2cap_pi(sk)->chan;
+
Didn't I fix this bug already?

http://permalink.gmane.org/gmane.linux.bluez.kernel/21537

Regards,
Andrei
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help