Commit 8bb2d28e authored by Brian Gerst's avatar Brian Gerst Committed by Borislav Petkov
Browse files

x86/signal: Remove sig parameter from frame setup functions 



Passing the signal number as a separate parameter is unnecessary, since
it is always ksig->sig.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Link: https://lore.kernel.org/r/20220606203802.158958-2-brgerst@gmail.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent a27e292b

arch/x86/ia32/ia32_signal.c

+6 −6
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, 
	return (void __user *) sp;

}



int ia32_setup_frame(int sig, struct ksignal *ksig,

int ia32_setup_frame(struct ksignal *ksig,

		     compat_sigset_t *set, struct pt_regs *regs)

{

	struct sigframe_ia32 __user *frame;
@@ -264,7 +264,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, 
	if (!user_access_begin(frame, sizeof(*frame)))

		return -EFAULT;



	unsafe_put_user(sig, &frame->sig, Efault);

	unsafe_put_user(ksig->sig, &frame->sig, Efault);

	unsafe_put_sigcontext32(&frame->sc, fp, regs, set, Efault);

	unsafe_put_user(set->sig[1], &frame->extramask[0], Efault);

	unsafe_put_user(ptr_to_compat(restorer), &frame->pretcode, Efault);
@@ -280,7 +280,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, 
	regs->ip = (unsigned long) ksig->ka.sa.sa_handler;



	/* Make -mregparm=3 work */

	regs->ax = sig;

	regs->ax = ksig->sig;

	regs->dx = 0;

	regs->cx = 0;
@@ -296,7 +296,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, 
	return -EFAULT;

}



int ia32_setup_rt_frame(int sig, struct ksignal *ksig,

int ia32_setup_rt_frame(struct ksignal *ksig,

			compat_sigset_t *set, struct pt_regs *regs)

{

	struct rt_sigframe_ia32 __user *frame;
@@ -321,7 +321,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, 
	if (!user_access_begin(frame, sizeof(*frame)))

		return -EFAULT;



	unsafe_put_user(sig, &frame->sig, Efault);

	unsafe_put_user(ksig->sig, &frame->sig, Efault);

	unsafe_put_user(ptr_to_compat(&frame->info), &frame->pinfo, Efault);

	unsafe_put_user(ptr_to_compat(&frame->uc), &frame->puc, Efault);
@@ -357,7 +357,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, 
	regs->ip = (unsigned long) ksig->ka.sa.sa_handler;



	/* Make -mregparm=3 work */

	regs->ax = sig;

	regs->ax = ksig->sig;

	regs->dx = (unsigned long) &frame->info;

	regs->cx = (unsigned long) &frame->uc;

arch/x86/include/asm/fpu/signal.h

+2 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
# include <uapi/asm/sigcontext.h>

# include <asm/user32.h>

struct ksignal;

int ia32_setup_rt_frame(int sig, struct ksignal *ksig,

int ia32_setup_rt_frame(struct ksignal *ksig,

			compat_sigset_t *set, struct pt_regs *regs);

int ia32_setup_frame(int sig, struct ksignal *ksig,

int ia32_setup_frame(struct ksignal *ksig,

		     compat_sigset_t *set, struct pt_regs *regs);

#else

# define user_i387_ia32_struct	user_i387_struct

arch/x86/kernel/signal.c

+11 −12
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static const struct { 
};



static int

__setup_frame(int sig, struct ksignal *ksig, sigset_t *set,

__setup_frame(struct ksignal *ksig, sigset_t *set,

	      struct pt_regs *regs)

{

	struct sigframe __user *frame;
@@ -336,7 +336,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set, 
	if (!user_access_begin(frame, sizeof(*frame)))

		return -EFAULT;



	unsafe_put_user(sig, &frame->sig, Efault);

	unsafe_put_user(ksig->sig, &frame->sig, Efault);

	unsafe_put_sigcontext(&frame->sc, fp, regs, set, Efault);

	unsafe_put_user(set->sig[1], &frame->extramask[0], Efault);

	if (current->mm->context.vdso)
@@ -363,7 +363,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set, 
	/* Set up registers for signal handler */

	regs->sp = (unsigned long)frame;

	regs->ip = (unsigned long)ksig->ka.sa.sa_handler;

	regs->ax = (unsigned long)sig;

	regs->ax = (unsigned long)ksig->sig;

	regs->dx = 0;

	regs->cx = 0;
@@ -379,7 +379,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set, 
	return -EFAULT;

}



static int __setup_rt_frame(int sig, struct ksignal *ksig,

static int __setup_rt_frame(struct ksignal *ksig,

			    sigset_t *set, struct pt_regs *regs)

{

	struct rt_sigframe __user *frame;
@@ -391,7 +391,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, 
	if (!user_access_begin(frame, sizeof(*frame)))

		return -EFAULT;



	unsafe_put_user(sig, &frame->sig, Efault);

	unsafe_put_user(ksig->sig, &frame->sig, Efault);

	unsafe_put_user(&frame->info, &frame->pinfo, Efault);

	unsafe_put_user(&frame->uc, &frame->puc, Efault);
@@ -428,7 +428,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, 
	/* Set up registers for signal handler */

	regs->sp = (unsigned long)frame;

	regs->ip = (unsigned long)ksig->ka.sa.sa_handler;

	regs->ax = (unsigned long)sig;

	regs->ax = (unsigned long)ksig->sig;

	regs->dx = (unsigned long)&frame->info;

	regs->cx = (unsigned long)&frame->uc;
@@ -458,7 +458,7 @@ static unsigned long frame_uc_flags(struct pt_regs *regs) 
	return flags;

}



static int __setup_rt_frame(int sig, struct ksignal *ksig,

static int __setup_rt_frame(struct ksignal *ksig,

			    sigset_t *set, struct pt_regs *regs)

{

	struct rt_sigframe __user *frame;
@@ -493,7 +493,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, 
	}



	/* Set up registers for signal handler */

	regs->di = sig;

	regs->di = ksig->sig;

	/* In case the signal handler was declared without prototypes */

	regs->ax = 0;
@@ -763,7 +763,6 @@ static inline int is_x32_frame(struct ksignal *ksig) 
static int

setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)

{

	int usig = ksig->sig;

	sigset_t *set = sigmask_to_save();

	compat_sigset_t *cset = (compat_sigset_t *) set;
@@ -773,13 +772,13 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) 
	/* Set up the stack frame */

	if (is_ia32_frame(ksig)) {

		if (ksig->ka.sa.sa_flags & SA_SIGINFO)

			return ia32_setup_rt_frame(usig, ksig, cset, regs);

			return ia32_setup_rt_frame(ksig, cset, regs);

		else

			return ia32_setup_frame(usig, ksig, cset, regs);

			return ia32_setup_frame(ksig, cset, regs);

	} else if (is_x32_frame(ksig)) {

		return x32_setup_rt_frame(ksig, cset, regs);

	} else {

		return __setup_rt_frame(ksig->sig, ksig, set, regs);

		return __setup_rt_frame(ksig, set, regs);

	}

}