Skip to contentSkip to conversation

compat_sys_clock_nanosleep: fix *rmtp handling for -EINTR case

PATCH In review Oleg Nesterov 1 participant 2 messages Feb 1, 2008

lore
Share & tools
lore
#0 lore raw

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.

kernel/compat.c renamed from kernel/compat.c~4_COMPAT_CLOCK +2 -4
@@ -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) {
#1 lore raw

Andrew, please ignore this patch.

It is wrong for the same reason as "PATCH 1/5".

Oleg.

Quoted 30 lines · Oleg Nesterov

COMPLETELY UNTESTED.

compat_sys_clock_nanosleep() update rmtp only if err == -ERESTART_RESTARTBLOCK. This is wrong, nanosleep() can return -EINTR if flags & TIMER_ABSTIME.

kernel/compat.c renamed from kernel/compat.c~4_COMPAT_CLOCK +2 -4
@@ -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) {