Commit 4ca2ea58 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/compat: convert to COMPAT_SYSCALL_DEFINEx part 3 



Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 208096ee

arch/s390/kernel/compat_linux.c

+6 −5
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ COMPAT_SYSCALL_DEFINE3(s390_setresgid16, u16, rgid, u16, egid, u16, sgid) 
			     low2highgid(sgid));

}



asmlinkage long sys32_getresgid16(u16 __user *rgidp, u16 __user *egidp, u16 __user *sgidp)

COMPAT_SYSCALL_DEFINE3(s390_getresgid16, u16 __user *, rgidp,

		       u16 __user *, egidp, u16 __user *, sgidp)

{

	const struct cred *cred = current_cred();

	int retval;
@@ -170,12 +171,12 @@ asmlinkage long sys32_getresgid16(u16 __user *rgidp, u16 __user *egidp, u16 __us 
	return retval;

}



asmlinkage long sys32_setfsuid16(u16 uid)

COMPAT_SYSCALL_DEFINE1(s390_setfsuid16, u16, uid)

{

	return sys_setfsuid((uid_t)uid);

}



asmlinkage long sys32_setfsgid16(u16 gid)

COMPAT_SYSCALL_DEFINE1(s390_setfsgid16, u16, gid)

{

	return sys_setfsgid((gid_t)gid);

}
@@ -218,7 +219,7 @@ static int groups16_from_user(struct group_info *group_info, u16 __user *groupli 
	return 0;

}



asmlinkage long sys32_getgroups16(int gidsetsize, u16 __user *grouplist)

COMPAT_SYSCALL_DEFINE2(s390_getgroups16, int, gidsetsize, u16 __user *, grouplist)

{

	const struct cred *cred = current_cred();

	int i;
@@ -243,7 +244,7 @@ asmlinkage long sys32_getgroups16(int gidsetsize, u16 __user *grouplist) 
	return i;

}



asmlinkage long sys32_setgroups16(int gidsetsize, u16 __user *grouplist)

COMPAT_SYSCALL_DEFINE2(s390_setgroups16, int, gidsetsize, u16 __user *, grouplist)

{

	struct group_info *group_info;

	int retval;

arch/s390/kernel/compat_linux.h

+5 −5
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ long compat_sys_s390_setuid16(u16 uid); 
long compat_sys_s390_setresuid16(u16 ruid, u16 euid, u16 suid);

long compat_sys_s390_getresuid16(u16 __user *ruid, u16 __user *euid, u16 __user *suid);

long compat_sys_s390_setresgid16(u16 rgid, u16 egid, u16 sgid);

long sys32_getresgid16(u16 __user *rgid, u16 __user *egid, u16 __user *sgid);

long sys32_setfsuid16(u16 uid);

long sys32_setfsgid16(u16 gid);

long sys32_getgroups16(int gidsetsize, u16 __user *grouplist);

long sys32_setgroups16(int gidsetsize, u16 __user *grouplist);

long compat_sys_s390_getresgid16(u16 __user *rgid, u16 __user *egid, u16 __user *sgid);

long compat_sys_s390_setfsuid16(u16 uid);

long compat_sys_s390_setfsgid16(u16 gid);

long compat_sys_s390_getgroups16(int gidsetsize, u16 __user *grouplist);

long compat_sys_s390_setgroups16(int gidsetsize, u16 __user *grouplist);

long sys32_getuid16(void);

long sys32_geteuid16(void);

long sys32_getgid16(void);

arch/s390/kernel/compat_wrapper.S

+0 −24
Original line number Diff line number Diff line
@@ -244,16 +244,6 @@ ENTRY(compat_sys_settimeofday_wrapper) 
	llgtr	%r3,%r3			# struct timezone *

	jg	compat_sys_settimeofday	# branch to system call



ENTRY(sys32_getgroups16_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# __kernel_old_gid_emu31_t *

	jg	sys32_getgroups16	# branch to system call



ENTRY(sys32_setgroups16_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# __kernel_old_gid_emu31_t *

	jg	sys32_setgroups16	# branch to system call



ENTRY(sys32_symlink_wrapper)

	llgtr	%r2,%r2			# const char *

	llgtr	%r3,%r3			# const char *
@@ -426,14 +416,6 @@ ENTRY(sys32_personality_wrapper) 
	llgfr	%r2,%r2			# unsigned int

	jg	sys_s390_personality	# branch to system call



ENTRY(sys32_setfsuid16_wrapper)

	llgfr	%r2,%r2			# __kernel_old_uid_emu31_t

	jg	sys32_setfsuid16	# branch to system call



ENTRY(sys32_setfsgid16_wrapper)

	llgfr	%r2,%r2			# __kernel_old_gid_emu31_t

	jg	sys32_setfsgid16	# branch to system call



ENTRY(sys32_llseek_wrapper)

	llgfr	%r2,%r2			# unsigned int

	llgfr	%r3,%r3			# unsigned long
@@ -552,12 +534,6 @@ ENTRY(sys32_poll_wrapper) 
	lgfr	%r4,%r4			# int

	jg	sys_poll		# branch to system call



ENTRY(sys32_getresgid16_wrapper)

	llgtr	%r2,%r2			# __kernel_old_gid_emu31_t *

	llgtr	%r3,%r3			# __kernel_old_gid_emu31_t *

	llgtr	%r4,%r4			# __kernel_old_gid_emu31_t *

	jg	sys32_getresgid16	# branch to system call



ENTRY(sys32_prctl_wrapper)

	lgfr	%r2,%r2			# int

	llgfr	%r3,%r3			# unsigned long

arch/s390/kernel/syscalls.S

+5 −5
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper) 
SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage)

SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper)

SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper)

SYSCALL(sys_getgroups16,sys_ni_syscall,sys32_getgroups16_wrapper)	/* 80 old getgroups16 syscall */

SYSCALL(sys_setgroups16,sys_ni_syscall,sys32_setgroups16_wrapper)	/* old setgroups16 syscall */

SYSCALL(sys_getgroups16,sys_ni_syscall,compat_sys_s390_getgroups16)	/* 80 old getgroups16 syscall */

SYSCALL(sys_setgroups16,sys_ni_syscall,compat_sys_s390_setgroups16)	/* old setgroups16 syscall */

NI_SYSCALL							/* old select syscall */

SYSCALL(sys_symlink,sys_symlink,sys32_symlink_wrapper)

NI_SYSCALL							/* old lstat syscall */
@@ -146,8 +146,8 @@ SYSCALL(sys_bdflush,sys_bdflush,sys32_bdflush_wrapper) 
SYSCALL(sys_sysfs,sys_sysfs,sys32_sysfs_wrapper)		/* 135 */

SYSCALL(sys_personality,sys_s390_personality,sys32_personality_wrapper)

NI_SYSCALL							/* for afs_syscall */

SYSCALL(sys_setfsuid16,sys_ni_syscall,sys32_setfsuid16_wrapper)	/* old setfsuid16 syscall */

SYSCALL(sys_setfsgid16,sys_ni_syscall,sys32_setfsgid16_wrapper)	/* old setfsgid16 syscall */

SYSCALL(sys_setfsuid16,sys_ni_syscall,compat_sys_s390_setfsuid16)	/* old setfsuid16 syscall */

SYSCALL(sys_setfsgid16,sys_ni_syscall,compat_sys_s390_setfsgid16)	/* old setfsgid16 syscall */

SYSCALL(sys_llseek,sys_llseek,sys32_llseek_wrapper)		/* 140 */

SYSCALL(sys_getdents,sys_getdents,sys32_getdents_wrapper)

SYSCALL(sys_select,sys_select,compat_sys_select_wrapper)
@@ -179,7 +179,7 @@ NI_SYSCALL /* old sys_query_module */ 
SYSCALL(sys_poll,sys_poll,sys32_poll_wrapper)

NI_SYSCALL							/* old nfsservctl */

SYSCALL(sys_setresgid16,sys_ni_syscall,compat_sys_s390_setresgid16)	/* 170 old setresgid16 syscall */

SYSCALL(sys_getresgid16,sys_ni_syscall,sys32_getresgid16_wrapper)	/* old getresgid16 syscall */

SYSCALL(sys_getresgid16,sys_ni_syscall,compat_sys_s390_getresgid16)	/* old getresgid16 syscall */

SYSCALL(sys_prctl,sys_prctl,sys32_prctl_wrapper)

SYSCALL(sys_rt_sigreturn,sys_rt_sigreturn,sys32_rt_sigreturn)

SYSCALL(sys_rt_sigaction,sys_rt_sigaction,compat_sys_rt_sigaction)