netdev - Re: [PATCH 1/2] net: Fix the condition passed to sk_wait

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Sat, 2 Oct 2010 18:30:04 -0700 (PDT)
From:	Nagendra Tomar <tomer_iisc@...oo.com>
To:	netdev@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, davem@...emloft.net
Subject: Re: [PATCH 1/2] net: Fix the condition passed to sk_wait_event()

Dave,
     Thinking more about it, we need to check for sk->sk_err, thus the 
existing code behaves fine. Just that we might incur an additional sleep
even while we know that the socket already has an error, but that should
be ok.
We only need the other patch. Pls ignore this, and sorry for the confusion.

Thanks,
Tomar

--- On Sun, 3/10/10, Nagendra Tomar <tomer_iisc@...oo.com> wrote:

> From: Nagendra Tomar <tomer_iisc@...oo.com>
> Subject: [PATCH 1/2] net: Fix the condition passed to sk_wait_event()
> To: netdev@...r.kernel.org
> Cc: linux-kernel@...r.kernel.org, davem@...emloft.net
> Date: Sunday, 3 October, 2010, 5:19
> This patch fixes the sk_wait_event()
> condition in the sk_stream_wait_connect() 
> function. With this change, we correctly check for the
> TCPF_ESTABLISHED and 
> TCPF_CLOSE_WAIT states and avoid potentially returning
> success when there
> might be an error on the socket.
> 
> Signed-off-by: Nagendra Singh Tomar
> <tomer_iisc@...xxxxxx>
> ---
> --- linux-2.6.35.7/net/core/stream.c.orig   
> 2010-03-24 09:30:00.000000000 +0530
> +++ linux-2.6.35.7/net/core/stream.c   
> 2010-03-24 09:30:17.000000000 +0530
> @@ -73,9 +73,8 @@ int sk_stream_wait_connect(struct sock *
>         
> prepare_to_wait(sk_sleep(sk), &wait,
> TASK_INTERRUPTIBLE);
>         
> sk->sk_write_pending++;
>          done =
> sk_wait_event(sk, timeo_p,
> -           
>          !sk->sk_err
> &&
> -           
>          !((1 <<
> sk->sk_state) &
> -           
>        
>    ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)));
> +           
>          ((1 <<
> sk->sk_state) &
> +           
>        
>    (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)));
>         
> finish_wait(sk_sleep(sk), &wait);
>         
> sk->sk_write_pending--;
>      } while (!done);
> 
> ---
> 
> 
> 
> 
> 



      
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html