Drop struct pt_regs * argument in compat_sys_execve() (733deca1) · Commits · 戴 / test

arch/tile/include/asm/compat.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -275,9 +275,6 @@ extern int compat_setup_rt_frame(int sig, struct k_sigaction *ka,
		struct compat_sigaction;
		struct compat_siginfo;
		struct compat_sigaltstack;
		long compat_sys_execve(const char __user *path,
		compat_uptr_t __user *argv,
		compat_uptr_t __user envp, struct pt_regs );
		long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act,
		struct compat_sigaction __user *oact,
		size_t sigsetsize);
		@@ -304,9 +301,6 @@ long compat_sys_sched_rr_get_interval(compat_pid_t pid,
		struct compat_timespec __user *interval);

		/* These are the intvec_64.S trampolines. */
		long _compat_sys_execve(const char __user *path,
		const compat_uptr_t __user *argv,
		const compat_uptr_t __user *envp);
		long _compat_sys_sigaltstack(const struct compat_sigaltstack __user *uss_ptr,
		struct compat_sigaltstack __user *uoss_ptr);
		long _compat_sys_rt_sigreturn(void);

+3 −0

Original line number	Diff line number	Diff line
		@@ -239,6 +239,9 @@ unsigned long get_wchan(struct task_struct *p);
		#define KSTK_TOP(task) (task_ksp0(task) - STACK_TOP_DELTA)
		#define task_pt_regs(task) \
		((struct pt_regs *)(task_ksp0(task) - KSTK_PTREGS_GAP) - 1)
		#define current_pt_regs() \
		((struct pt_regs *)((stack_pointer \| (THREAD_SIZE - 1)) - \
		(KSTK_PTREGS_GAP - 1)) - 1)
		#define task_sp(task) (task_pt_regs(task)->sp)
		#define task_pc(task) (task_pt_regs(task)->pc)
		/* Aliases for pc and sp (used in fs/proc/array.c) */

+0 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ long compat_sys_sched_rr_get_interval(compat_pid_t pid,
		#define compat_sys_readahead sys32_readahead

		/* Call the trampolines to manage pt_regs where necessary. */
		#define compat_sys_execve _compat_sys_execve
		#define compat_sys_sigaltstack _compat_sys_sigaltstack
		#define compat_sys_rt_sigreturn _compat_sys_rt_sigreturn
		#define sys_clone _sys_clone

+0 −1

Original line number	Diff line number	Diff line
		@@ -1194,7 +1194,6 @@ PTREGS_SYSCALL(sys_execve, r3)
		PTREGS_SYSCALL(sys_sigaltstack, r2)
		PTREGS_SYSCALL_SIGRETURN(sys_rt_sigreturn, r0)
		#ifdef CONFIG_COMPAT
		PTREGS_SYSCALL(compat_sys_execve, r3)
		PTREGS_SYSCALL(compat_sys_sigaltstack, r2)
		PTREGS_SYSCALL_SIGRETURN(compat_sys_rt_sigreturn, r0)
		#endif

+3 −3

Original line number	Diff line number	Diff line
		@@ -614,8 +614,7 @@ out:
		#ifdef CONFIG_COMPAT
		long compat_sys_execve(const char __user *path,
		compat_uptr_t __user *argv,
		compat_uptr_t __user *envp,
		struct pt_regs *regs)
		compat_uptr_t __user *envp)
		{
		long error;
		struct filename *filename;
		@@ -624,7 +623,8 @@ long compat_sys_execve(const char __user *path,
		error = PTR_ERR(filename);
		if (IS_ERR(filename))
		goto out;
		error = compat_do_execve(filename->name, argv, envp, regs);
		error = compat_do_execve(filename->name, argv, envp,
		current_pt_regs());
		putname(filename);
		if (error == 0)
		single_step_execve();