s390/compat,signal: fix return value of copy_siginfo_(to|from)_user32()

heicarst · Martin Schwidefsky · commit 0ebfd313fd4b · 2013-10-15T13:47:59.000+02:00
The return value of copy_siginfo_(to|from)_user32() gets passed to
user space, however we do not convert a positive return value from
copy_(to|from)_user to -EFAULT.
Therefore these functions (and the calling system calls) my incorrectly
return a positive number (bytes not copied) instead of -EFAULT.

Signed-off-by: Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;
Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
@@ -99,7 +99,7 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
 			break;
 		}
 	}
-	return err;
+	return err ? -EFAULT : 0;
 }
 
 int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
@@ -148,7 +148,7 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
 			break;
 		}
 	}
-	return err;
+	return err ? -EFAULT : 0;
 }
 
 static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs)

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ int copy_siginfo_to_user32(compat_siginfo_t __user to, siginfo_t from)`
`99`	`99`	`break;`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`- return err;`
	`102`	`+ return err ? -EFAULT : 0;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`int copy_siginfo_from_user32(siginfo_t to, compat_siginfo_t __user from)`
`@@ -148,7 +148,7 @@ int copy_siginfo_from_user32(siginfo_t to, compat_siginfo_t __user from)`
`148`	`148`	`break;`
`149`	`149`	`}`
`150`	`150`	`}`
`151`		`- return err;`
	`151`	`+ return err ? -EFAULT : 0;`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`static int save_sigregs32(struct pt_regs regs, _sigregs32 __user sregs)`