diff options
| author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2009-09-16 04:37:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-16 20:57:35 -0700 |
| commit | d9973179aef2af88b6fe4cc1df7ced6fe7cec7d0 (patch) | |
| tree | adfe0033e2ec3eb11cd492ba4b38261257e9c753 /net/iucv | |
| parent | b29e4da41eb1114080b06dce31326d5a0e96a15a (diff) | |
| download | linux-stable-d9973179aef2af88b6fe4cc1df7ced6fe7cec7d0.tar.gz linux-stable-d9973179aef2af88b6fe4cc1df7ced6fe7cec7d0.tar.bz2 linux-stable-d9973179aef2af88b6fe4cc1df7ced6fe7cec7d0.zip | |
af_iucv: fix race in __iucv_sock_wait()
Moving prepare_to_wait before the condition to avoid a race between
schedule_timeout and wake up.
The race can appear during iucv_sock_connect() and iucv_callback_connack().
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/iucv')
| -rw-r--r-- | net/iucv/af_iucv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 3c915fb42917..21ee68be02ee 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -59,8 +59,8 @@ do { \ DEFINE_WAIT(__wait); \ long __timeo = timeo; \ ret = 0; \ + prepare_to_wait(sk->sk_sleep, &__wait, TASK_INTERRUPTIBLE); \ while (!(condition)) { \ - prepare_to_wait(sk->sk_sleep, &__wait, TASK_INTERRUPTIBLE); \ if (!__timeo) { \ ret = -EAGAIN; \ break; \ |