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

Commit 8f9c0119 authored by Catalin Marinas's avatar Catalin Marinas Committed by Al Viro
Browse files

compat: fs: Generic compat_sys_sendfile implementation 



This function is used by sparc, powerpc and arm64 for compat support.
The patch adds a generic implementation which calls do_sendfile()
directly and avoids set_fs().

The sparc architecture has wrappers for the sign extensions while
powerpc relies on the compiler to do the this. The patch adds wrappers
for powerpc to handle the u32->int type conversion.

compat_sys_sendfile64() can be replaced by a sys_sendfile() call since
compat_loff_t has the same size as off_t on a 64-bit system.

On powerpc, the patch also changes the 64-bit sendfile call from
sys_sendile64 to sys_sendfile.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8c0a8537

arch/powerpc/include/asm/systbl.h

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ SYSCALL_SPU(getcwd) 
SYSCALL_SPU(capget)

SYSCALL_SPU(capset)

COMPAT_SYS(sigaltstack)

SYSX_SPU(sys_sendfile64,compat_sys_sendfile,sys_sendfile)

SYSX_SPU(sys_sendfile,compat_sys_sendfile_wrapper,sys_sendfile)

SYSCALL(ni_syscall)

SYSCALL(ni_syscall)

PPC_SYS(vfork)
@@ -229,7 +229,7 @@ COMPAT_SYS_SPU(sched_setaffinity) 
COMPAT_SYS_SPU(sched_getaffinity)

SYSCALL(ni_syscall)

SYSCALL(ni_syscall)

SYS32ONLY(sendfile64)

SYSX(sys_ni_syscall,compat_sys_sendfile64_wrapper,sys_sendfile64)

COMPAT_SYS_SPU(io_setup)

SYSCALL_SPU(io_destroy)

COMPAT_SYS_SPU(io_getevents)

arch/powerpc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ 
#define __ARCH_WANT_COMPAT_SYS_TIME

#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND

#define __ARCH_WANT_SYS_NEWFSTATAT

#define __ARCH_WANT_COMPAT_SYS_SENDFILE

#endif



/*

arch/powerpc/kernel/sys_ppc32.c

+7 −38
Original line number Diff line number Diff line
@@ -143,48 +143,17 @@ long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t pt 
 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)

 * and the register representation of a signed int (msr in 64-bit mode) is performed.

 */

asmlinkage long compat_sys_sendfile(u32 out_fd, u32 in_fd, compat_off_t __user * offset, u32 count)

asmlinkage long compat_sys_sendfile_wrapper(u32 out_fd, u32 in_fd,

					    compat_off_t __user *offset, u32 count)

{

	mm_segment_t old_fs = get_fs();

	int ret;

	off_t of;

	off_t __user *up;



	if (offset && get_user(of, offset))

		return -EFAULT;



	/* The __user pointer cast is valid because of the set_fs() */		

	set_fs(KERNEL_DS);

	up = offset ? (off_t __user *) &of : NULL;

	ret = sys_sendfile((int)out_fd, (int)in_fd, up, count);

	set_fs(old_fs);

	

	if (offset && put_user(of, offset))

		return -EFAULT;

		

	return ret;

	return compat_sys_sendfile((int)out_fd, (int)in_fd, offset, count);

}



asmlinkage int compat_sys_sendfile64(int out_fd, int in_fd, compat_loff_t __user *offset, s32 count)

asmlinkage long compat_sys_sendfile64_wrapper(u32 out_fd, u32 in_fd,

					      compat_loff_t __user *offset, u32 count)

{

	mm_segment_t old_fs = get_fs();

	int ret;

	loff_t lof;

	loff_t __user *up;

	

	if (offset && get_user(lof, offset))

		return -EFAULT;

		

	/* The __user pointer cast is valid because of the set_fs() */		

	set_fs(KERNEL_DS);

	up = offset ? (loff_t __user *) &lof : NULL;

	ret = sys_sendfile64(out_fd, in_fd, up, count);

	set_fs(old_fs);

	

	if (offset && put_user(lof, offset))

		return -EFAULT;

		

	return ret;

	return sys_sendfile((int)out_fd, (int)in_fd,

			    (off_t __user *)offset, count);

}



long compat_sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,

arch/sparc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ 
#else

#define __ARCH_WANT_COMPAT_SYS_TIME

#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND

#define __ARCH_WANT_COMPAT_SYS_SENDFILE

#endif



/*

arch/sparc/kernel/sys32.S

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ SIGN1(sys32_mkdir, sys_mkdir, %o1) 
SIGN3(sys32_futex, compat_sys_futex, %o1, %o2, %o5)

SIGN1(sys32_sysfs, compat_sys_sysfs, %o0)

SIGN2(sys32_sendfile, compat_sys_sendfile, %o0, %o1)

SIGN2(sys32_sendfile64, compat_sys_sendfile64, %o0, %o1)

SIGN2(sys32_sendfile64, sys_sendfile, %o0, %o1)

SIGN1(sys32_prctl, sys_prctl, %o0)

SIGN1(sys32_sched_rr_get_interval, compat_sys_sched_rr_get_interval, %o0)

SIGN2(sys32_waitpid, sys_waitpid, %o0, %o2)