[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <590816.4455.qm@web53707.mail.re2.yahoo.com>
Date: Sat, 2 Oct 2010 05:08:13 -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()
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@...oo.com>
---
--- 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 linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists