diff mbox

[1/2] net: Fix the condition passed to sk_wait_event()

Message ID 590816.4455.qm@web53707.mail.re2.yahoo.com
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Nagendra Tomar Oct. 2, 2010, 12:08 p.m. UTC 
This is the first part of the split up patch submitted in http://www.spinics.net/lists/netdev/msg142617.html

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 is an error on the socket.

Signed-off-by: Nagendra Singh Tomar <tomer_iisc@yahoo.com>
---



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

Comments

David Miller Oct. 2, 2010, 8:26 p.m. UTC | #1 
Your patch is still corrupted, your email client is splitting up
long lines.

Please, save us a lot of time by test emailing the patch to yourself,
and then trying to apply the patch as you receive it.  Do this until
you're fixed all of the formatting problems and then you can send it
here.

Do not resend the patch by simply replying again to this thread,
send a fresh posting so that "Re: " doesn't show up in the subject
and this way I can apply it directly without any editing.

Thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nagendra Tomar Oct. 2, 2010, 11:54 p.m. UTC | #2 
Dave,
     I had done the exercise of sending the patch to myself and applying it (copy-pasting just the patch). One thing that I see is the long line in the description. If you are referring to that, I've fixed it and submitted it again. If not this, I'm at loss.

Thanks,
Tomar

--- On Sun, 3/10/10, David Miller <davem@davemloft.net> wrote:

> From: David Miller <davem@davemloft.net>
> Subject: Re: [PATCH 1/2] net: Fix the condition passed to sk_wait_event()
> To: tomer_iisc@yahoo.com
> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
> Date: Sunday, 3 October, 2010, 1:56
> 
> Your patch is still corrupted, your email client is
> splitting up
> long lines.
> 
> Please, save us a lot of time by test emailing the patch to
> yourself,
> and then trying to apply the patch as you receive it. 
> Do this until
> you're fixed all of the formatting problems and then you
> can send it
> here.
> 
> Do not resend the patch by simply replying again to this
> thread,
> send a fresh posting so that "Re: " doesn't show up in the
> subject
> and this way I can apply it directly without any editing.
> 
> Thank you.
> 


      
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Oct. 3, 2010, 12:06 a.m. UTC | #3 
From: Nagendra Tomar <tomer_iisc@yahoo.com>
Date: Sat, 2 Oct 2010 16:54:23 -0700 (PDT)

>      I had done the exercise of sending the patch to myself and
>      applying it (copy-pasting just the patch). One thing that I see
>      is the long line in the description. If you are referring to
>      that, I've fixed it and submitted it again. If not this, I'm at
>      loss.

This new submission looks good, thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Dumazet Oct. 3, 2010, 4:53 a.m. UTC | #4 
Le samedi 02 octobre 2010 à 17:06 -0700, David Miller a écrit :
> From: Nagendra Tomar <tomer_iisc@yahoo.com>
> Date: Sat, 2 Oct 2010 16:54:23 -0700 (PDT)
> 
> >      I had done the exercise of sending the patch to myself and
> >      applying it (copy-pasting just the patch). One thing that I see
> >      is the long line in the description. If you are referring to
> >      that, I've fixed it and submitted it again. If not this, I'm at
> >      loss.
> 
> This new submission looks good, thank you.

Yes, but the email address in the "Signed-odd-by: ...." is mangled :(


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

Patch

--- 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);