2008-02-01 13:36:25

by Oleg Nesterov

Subject: [PATCH 4/5] compat_sys_clock_nanosleep: fix *rmtp handling for -EINTR case

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 <[email protected]>

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

2008-02-01 14:32:39

by Oleg Nesterov

Subject: Re: [PATCH 4/5] compat_sys_clock_nanosleep: fix *rmtp handling for -EINTR case

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 <[email protected]>
>
> --- 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) {