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

santosh prasad nayak
2012-03-01T05:49:14Z

@Dan,
In future patches I will take care of it. Is it ok ? If
required I can resend the patch with required changes on subject line.

@Andrei

In my local clone your changes are not visible.

What is the schedule of linux-next ?
Is it updated every week or bi-weekly or monthly ?

Regards
Santosh

On Thu, Mar 1, 2012 at 2:15 AM, Andrei Emeltchenko
<andrei.emeltchenko.news@gmail.com> wrote:
> Hi Santosh,
>
> On Wed, Feb 29, 2012 at 7:06 PM, santosh nayak
> <santoshprasadnayak@gmail.com> wrote:
>> From: Santosh Nayak <santoshprasadnayak@gmail.com>
>>
>> Silencing Static checker warning.
>> 1. Endian warning
>> 2. variable dereferenced before check 'sk' .
>>
>> Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>
>> ---
>>  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
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html