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

Commit 5b3eb3ad authored by Al Viro's avatar Al Viro
Browse files

x86: switch to generic old sigaction 



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

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ config X86 
	select GENERIC_COMPAT_RT_SIGQUEUEINFO

	select GENERIC_COMPAT_RT_SIGPENDING

	select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION

	select OLD_SIGACTION if X86_32

	select COMPAT_OLD_SIGACTION if IA32_EMULATION



config INSTRUCTION_DECODER

	def_bool y

arch/x86/ia32/sys_ia32.c

+0 −39
Original line number Diff line number Diff line
@@ -172,45 +172,6 @@ asmlinkage long sys32_mprotect(unsigned long start, size_t len, 
	return sys_mprotect(start, len, prot);

}



asmlinkage long sys32_sigaction(int sig, struct old_sigaction32 __user *act,

				struct old_sigaction32 __user *oact)

{

	struct k_sigaction new_ka, old_ka;

	int ret;



	if (act) {

		compat_old_sigset_t mask;

		compat_uptr_t handler, restorer;



		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||

		    __get_user(handler, &act->sa_handler) ||

		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||

		    __get_user(restorer, &act->sa_restorer) ||

		    __get_user(mask, &act->sa_mask))

			return -EFAULT;



		new_ka.sa.sa_handler = compat_ptr(handler);

		new_ka.sa.sa_restorer = compat_ptr(restorer);



		siginitset(&new_ka.sa.sa_mask, mask);

	}



	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);



	if (!ret && oact) {

		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||

		    __put_user(ptr_to_compat(old_ka.sa.sa_handler),

			       &oact->sa_handler) ||

		    __put_user(ptr_to_compat(old_ka.sa.sa_restorer),

			       &oact->sa_restorer) ||

		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||

		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))

			return -EFAULT;

	}



	return ret;

}



asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,

			      int options)

{

arch/x86/include/asm/ia32.h

+0 −7
Original line number Diff line number Diff line
@@ -13,13 +13,6 @@ 
#include <asm/sigcontext32.h>



/* signal.h */

struct old_sigaction32 {

	unsigned int  sa_handler;	/* Really a pointer, but need to deal

					   with 32 bits */

	compat_old_sigset_t sa_mask;	/* A 32 bit mask */

	unsigned int sa_flags;

	unsigned int sa_restorer;	/* Another 32 bit pointer */

};



struct ucontext_ia32 {

	unsigned int	  uc_flags;

arch/x86/include/asm/signal.h

+0 −9
Original line number Diff line number Diff line
@@ -34,15 +34,6 @@ extern void do_notify_resume(struct pt_regs *, void *, __u32); 


#define __ARCH_HAS_SA_RESTORER



#ifdef __i386__

struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	__sigrestore_t sa_restorer;

};



#endif /* !__i386__ */

#include <asm/sigcontext.h>



#ifdef __i386__

arch/x86/include/asm/sys_ia32.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ struct mmap_arg_struct32; 
asmlinkage long sys32_mmap(struct mmap_arg_struct32 __user *);

asmlinkage long sys32_mprotect(unsigned long, size_t, unsigned long);



struct old_sigaction32;

asmlinkage long sys32_sigaction(int, struct old_sigaction32 __user *,

				struct old_sigaction32 __user *);

asmlinkage long sys32_alarm(unsigned int);



asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);