Commit 3a142ed9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 

Pull misc syscall fixes from Al Viro:

 - compat syscall fixes (discussed back in December)

 - a couple of "make life easier for sigaltstack stuff by reducing
   inter-tree dependencies"

 - fix up compiler/asmlinkage calling convention disagreement of
   sys_clone()

 - misc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  sys_clone() needs asmlinkage_protect
  make sure that /linuxrc has std{in,out,err}
  x32: fix sigtimedwait
  x32: fix waitid()
  switch compat_sys_wait4() and compat_sys_waitid() to COMPAT_SYSCALL_DEFINE
  switch compat_sys_sigaltstack() to COMPAT_SYSCALL_DEFINE
  CONFIG_GENERIC_SIGALTSTACK build breakage with asm-generic/syscalls.h
  Ensure that kernel_init_freeable() is not inlined into non __init code
parents edea0d03 b1e0318b

include/asm-generic/syscalls.h

+2 −0
Original line number Diff line number Diff line
@@ -21,10 +21,12 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len, 
			unsigned long fd, off_t pgoff);

#endif



#ifndef CONFIG_GENERIC_SIGALTSTACK

#ifndef sys_sigaltstack

asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *,

			struct pt_regs *);

#endif

#endif



#ifndef sys_rt_sigreturn

asmlinkage long sys_rt_sigreturn(struct pt_regs *regs);

init/do_mounts_initrd.c

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ __setup("noinitrd", no_initrd); 
static int init_linuxrc(struct subprocess_info *info, struct cred *new)

{

	sys_unshare(CLONE_FS | CLONE_FILES);

	/* stdin/stdout/stderr for /linuxrc */

	sys_open("/dev/console", O_RDWR, 0);

	sys_dup(0);

	sys_dup(0);

	/* move initrd over / and chdir/chroot in initrd root */

	sys_chdir("/root");

	sys_mount(".", "/", NULL, MS_MOVE, NULL);

init/main.c

+2 −2
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ static int run_init_process(const char *init_filename) 
		(const char __user *const __user *)envp_init);

}



static void __init kernel_init_freeable(void);

static noinline void __init kernel_init_freeable(void);



static int __ref kernel_init(void *unused)

{
@@ -845,7 +845,7 @@ static int __ref kernel_init(void *unused) 
	      "See Linux Documentation/init.txt for guidance.");

}



static void __init kernel_init_freeable(void)

static noinline void __init kernel_init_freeable(void)

{

	/*

	 * Wait until kthreadd is all set-up.

kernel/compat.c

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

}



asmlinkage long

compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,

	struct compat_rusage __user *ru)

COMPAT_SYSCALL_DEFINE4(wait4,

	compat_pid_t, pid,

	compat_uint_t __user *, stat_addr,

	int, options,

	struct compat_rusage __user *, ru)

{

	if (!ru) {

		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,

		struct compat_siginfo __user *uinfo, int options,

		struct compat_rusage __user *uru)

COMPAT_SYSCALL_DEFINE5(waitid,

		int, which, compat_pid_t, pid,

		struct compat_siginfo __user *, uinfo, int, options,

		struct compat_rusage __user *, uru)

{

	siginfo_t info;

	struct rusage ru;
@@ -584,6 +587,10 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid, 
		return ret;



	if (uru) {

		/* sys_waitid() overwrites everything in ru */

		if (COMPAT_USE_64BIT_TIME)

			ret = copy_to_user(uru, &ru, sizeof(ru));

		else

			ret = put_compat_rusage(&ru, uru);

		if (ret)

			return ret;
@@ -994,7 +1001,7 @@ compat_sys_rt_sigtimedwait (compat_sigset_t __user *uthese, 
	sigset_from_compat(&s, &s32);



	if (uts) {

		if (get_compat_timespec(&t, uts))

		if (compat_get_timespec(&t, uts))

			return -EFAULT;

	}

kernel/fork.c

+4 −2
Original line number Diff line number Diff line
@@ -1668,8 +1668,10 @@ SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp, 
		 int, tls_val)

#endif

{

	return do_fork(clone_flags, newsp, 0,

		parent_tidptr, child_tidptr);

	long ret = do_fork(clone_flags, newsp, 0, parent_tidptr, child_tidptr);

	asmlinkage_protect(5, ret, clone_flags, newsp,

			parent_tidptr, child_tidptr, tls_val);

	return ret;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE