Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f45adb04 authored by Al Viro's avatar Al Viro
Browse files

x86: switch to generic compat rt_sigpending() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 49cb25e9

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ config X86 
	select MODULES_USE_ELF_RELA if X86_64

	select CLONE_BACKWARDS if X86_32

	select GENERIC_SIGALTSTACK

	select GENERIC_COMPAT_RT_SIGPENDING



config INSTRUCTION_DECODER

	def_bool y

arch/x86/ia32/sys_ia32.c

+0 −24
Original line number Diff line number Diff line
@@ -310,30 +310,6 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid, 
	return ret;

}



asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,

				    compat_size_t sigsetsize)

{

	sigset_t s;

	compat_sigset_t s32;

	int ret;

	mm_segment_t old_fs = get_fs();



	set_fs(KERNEL_DS);

	ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);

	set_fs(old_fs);

	if (!ret) {

		switch (_NSIG_WORDS) {

		case 4: s32.sig[7] = (s.sig[3] >> 32); s32.sig[6] = s.sig[3];

		case 3: s32.sig[5] = (s.sig[2] >> 32); s32.sig[4] = s.sig[2];

		case 2: s32.sig[3] = (s.sig[1] >> 32); s32.sig[2] = s.sig[1];

		case 1: s32.sig[1] = (s.sig[0] >> 32); s32.sig[0] = s.sig[0];

		}

		if (copy_to_user(set, &s32, sizeof(compat_sigset_t)))

			return -EFAULT;

	}

	return ret;

}



asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,

				      compat_siginfo_t __user *uinfo)

{

arch/x86/include/asm/sys_ia32.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ asmlinkage long sys32_sysfs(int, u32, u32); 


asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,

					    struct compat_timespec __user *);

asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *, compat_size_t);

asmlinkage long sys32_rt_sigqueueinfo(int, int, compat_siginfo_t __user *);



asmlinkage long sys32_pread(unsigned int, char __user *, u32, u32, u32);

arch/x86/syscalls/syscall_32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
173	i386	rt_sigreturn		sys_rt_sigreturn		stub32_rt_sigreturn

174	i386	rt_sigaction		sys_rt_sigaction		sys32_rt_sigaction

175	i386	rt_sigprocmask		sys_rt_sigprocmask

176	i386	rt_sigpending		sys_rt_sigpending		sys32_rt_sigpending

176	i386	rt_sigpending		sys_rt_sigpending		compat_sys_rt_sigpending

177	i386	rt_sigtimedwait		sys_rt_sigtimedwait		compat_sys_rt_sigtimedwait

178	i386	rt_sigqueueinfo		sys_rt_sigqueueinfo		sys32_rt_sigqueueinfo

179	i386	rt_sigsuspend		sys_rt_sigsuspend

arch/x86/syscalls/syscall_64.tbl

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ 
519	x32	recvmsg			compat_sys_recvmsg

520	x32	execve			stub_x32_execve

521	x32	ptrace			compat_sys_ptrace

522	x32	rt_sigpending		sys32_rt_sigpending

522	x32	rt_sigpending		compat_sys_rt_sigpending

523	x32	rt_sigtimedwait		compat_sys_rt_sigtimedwait

524	x32	rt_sigqueueinfo		sys32_rt_sigqueueinfo

525	x32	sigaltstack		compat_sys_sigaltstack