Commit 8d9807b1 authored Dec 23, 2012 by Al Viro

switch compat_sys_wait4() and compat_sys_waitid() to COMPAT_SYSCALL_DEFINE

Strictly speaking, ppc64 needs it for C ABI compliance. Realistically
I would be very surprised if e.g. passing 0xffffffff as 'options'
argument to waitid() from 32bit task would cause problems, but yes,
it puts us into undefined behaviour territory. ppc64 expects int
argument to be passed in 64bit register with bits 31..63 containing
the same value. SYSCALL_DEFINE on ppc provides a wrapper that normalizes
the value passed from userland; so does COMPAT_SYSCALL_DEFINE. Plain
declaration of compat_sys_something() with an int argument obviously
doesn't. Again, for wait4 and waitid I would be extremely surprised
if gcc started to produce code depending on that value having been
properly sign-extended - the argument(s) in question end up passed
blindly to sys_wait4 and sys_waitid resp. and normalization for native
syscalls takes care of their use there. Still, better to use
COMPAT_SYSCALL_DEFINE here than worry about nasal daemons...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent 90228fc1

kernel/compat.c

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -535,9 +535,11 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
	return 0;		return 0;
	}		}

	asmlinkage long		COMPAT_SYSCALL_DEFINE4(wait4,
	compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,		compat_pid_t, pid,
	struct compat_rusage __user *ru)		compat_uint_t __user *, stat_addr,
			int, options,
			struct compat_rusage __user *, ru)
	{		{
	if (!ru) {		if (!ru) {
	return sys_wait4(pid, stat_addr, options, NULL);		return sys_wait4(pid, stat_addr, options, NULL);
	@@ -564,9 +566,10 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
	}		}
	}		}

	asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,		COMPAT_SYSCALL_DEFINE5(waitid,
	struct compat_siginfo __user *uinfo, int options,		int, which, compat_pid_t, pid,
	struct compat_rusage __user *uru)		struct compat_siginfo __user *, uinfo, int, options,
			struct compat_rusage __user *, uru)
	{		{
	siginfo_t info;		siginfo_t info;
	struct rusage ru;		struct rusage ru;

Admin message