* [PATCH 4/5] compat_sys_clock_nanosleep: fix *rmtp handling for -EINTR case
@ 2008-02-01 13:38 Oleg Nesterov
2008-02-01 14:35 ` Oleg Nesterov
0 siblings, 1 reply; 2+ messages in thread
From: Oleg Nesterov @ 2008-02-01 13:38 UTC (permalink / raw)
To: Andrew Morton, Thomas Gleixner
Cc: Alexey Dobriyan, Ingo Molnar, Pavel Emelyanov, Peter Zijlstra,
Toyo Abe, linux-kernel
COMPLETELY UNTESTED.
compat_sys_clock_nanosleep() update rmtp only if err == -ERESTART_RESTARTBLOCK.
This is wrong, nanosleep() can return -EINTR if flags & TIMER_ABSTIME.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
--- MM/kernel/compat.c~4_COMPAT_CLOCK 2008-02-01 14:50:01.000000000 +0300
+++ MM/kernel/compat.c 2008-02-01 15:05:28.000000000 +0300
@@ -618,8 +618,7 @@ static long compat_clock_nanosleep_resta
err = clock_nanosleep_restart(restart);
set_fs(oldfs);
- if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
- put_compat_timespec(&tu, rmtp))
+ if (err && rmtp && put_compat_timespec(&tu, rmtp))
return -EFAULT;
if (err == -ERESTART_RESTARTBLOCK) {
@@ -648,8 +647,7 @@ long compat_sys_clock_nanosleep(clockid_
(struct timespec __user *) &out);
set_fs(oldfs);
- if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
- put_compat_timespec(&out, rmtp))
+ if (err && rmtp && put_compat_timespec(&out, rmtp))
return -EFAULT;
if (err == -ERESTART_RESTARTBLOCK) {
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH 4/5] compat_sys_clock_nanosleep: fix *rmtp handling for -EINTR case
2008-02-01 13:38 [PATCH 4/5] compat_sys_clock_nanosleep: fix *rmtp handling for -EINTR case Oleg Nesterov
@ 2008-02-01 14:35 ` Oleg Nesterov
0 siblings, 0 replies; 2+ messages in thread
From: Oleg Nesterov @ 2008-02-01 14:35 UTC (permalink / raw)
To: Andrew Morton, Thomas Gleixner
Cc: Alexey Dobriyan, Ingo Molnar, Pavel Emelyanov, Peter Zijlstra,
Toyo Abe, linux-kernel
Andrew, please ignore this patch.
It is wrong for the same reason as "PATCH 1/5".
Oleg.
On 02/01, Oleg Nesterov wrote:
>
> COMPLETELY UNTESTED.
>
> compat_sys_clock_nanosleep() update rmtp only if err == -ERESTART_RESTARTBLOCK.
> This is wrong, nanosleep() can return -EINTR if flags & TIMER_ABSTIME.
>
> Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
>
> --- MM/kernel/compat.c~4_COMPAT_CLOCK 2008-02-01 14:50:01.000000000 +0300
> +++ MM/kernel/compat.c 2008-02-01 15:05:28.000000000 +0300
> @@ -618,8 +618,7 @@ static long compat_clock_nanosleep_resta
> err = clock_nanosleep_restart(restart);
> set_fs(oldfs);
>
> - if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
> - put_compat_timespec(&tu, rmtp))
> + if (err && rmtp && put_compat_timespec(&tu, rmtp))
> return -EFAULT;
>
> if (err == -ERESTART_RESTARTBLOCK) {
> @@ -648,8 +647,7 @@ long compat_sys_clock_nanosleep(clockid_
> (struct timespec __user *) &out);
> set_fs(oldfs);
>
> - if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
> - put_compat_timespec(&out, rmtp))
> + if (err && rmtp && put_compat_timespec(&out, rmtp))
> return -EFAULT;
>
> if (err == -ERESTART_RESTARTBLOCK) {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-01 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-01 13:38 [PATCH 4/5] compat_sys_clock_nanosleep: fix *rmtp handling for -EINTR case Oleg Nesterov
2008-02-01 14:35 ` Oleg Nesterov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®