08d7676083
Pull compat cleanup from Al Viro:
"Mostly about syscall wrappers this time; there will be another pile
with patches in the same general area from various people, but I'd
rather push those after both that and vfs.git pile are in."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
syscalls.h: slightly reduce the jungles of macros
get rid of union semop in sys_semctl(2) arguments
make do_mremap() static
sparc: no need to sign-extend in sync_file_range() wrapper
ppc compat wrappers for add_key(2) and request_key(2) are pointless
x86: trim sys_ia32.h
x86: sys32_kill and sys32_mprotect are pointless
get rid of compat_sys_semctl() and friends in case of ARCH_WANT_OLD_COMPAT_IPC
merge compat sys_ipc instances
consolidate compat lookup_dcookie()
convert vmsplice to COMPAT_SYSCALL_DEFINE
switch getrusage() to COMPAT_SYSCALL_DEFINE
switch epoll_pwait to COMPAT_SYSCALL_DEFINE
convert sendfile{,64} to COMPAT_SYSCALL_DEFINE
switch signalfd{,4}() to COMPAT_SYSCALL_DEFINE
make SYSCALL_DEFINE<n>-generated wrappers do asmlinkage_protect
make HAVE_SYSCALL_WRAPPERS unconditional
consolidate cond_syscall and SYSCALL_ALIAS declarations
teach SYSCALL_DEFINE<n> how to deal with long long/unsigned long long
get rid of duplicate logics in __SC_....[1-6] definitions
108 lines
3.6 KiB
C
108 lines
3.6 KiB
C
/*
|
|
* Copyright 2010 Tilera Corporation. All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, version 2.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for
|
|
* more details.
|
|
*/
|
|
|
|
/* Adjust unistd.h to provide 32-bit numbers and functions. */
|
|
#define __SYSCALL_COMPAT
|
|
|
|
#include <linux/compat.h>
|
|
#include <linux/syscalls.h>
|
|
#include <linux/kdev_t.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/signal.h>
|
|
#include <asm/syscalls.h>
|
|
|
|
/*
|
|
* Syscalls that take 64-bit numbers traditionally take them in 32-bit
|
|
* "high" and "low" value parts on 32-bit architectures.
|
|
* In principle, one could imagine passing some register arguments as
|
|
* fully 64-bit on TILE-Gx in 32-bit mode, but it seems easier to
|
|
* adapt the usual convention.
|
|
*/
|
|
|
|
COMPAT_SYSCALL_DEFINE4(truncate64, char __user *, filename, u32, dummy,
|
|
u32, low, u32, high)
|
|
{
|
|
return sys_truncate(filename, ((loff_t)high << 32) | low);
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE4(ftruncate64, unsigned int, fd, u32, dummy,
|
|
u32, low, u32, high)
|
|
{
|
|
return sys_ftruncate(fd, ((loff_t)high << 32) | low);
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE6(pread64, unsigned int, fd, char __user *, ubuf,
|
|
size_t, count, u32, dummy, u32, low, u32, high)
|
|
{
|
|
return sys_pread64(fd, ubuf, count, ((loff_t)high << 32) | low);
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE6(pwrite64, unsigned int, fd, char __user *, ubuf,
|
|
size_t, count, u32, dummy, u32, low, u32, high)
|
|
{
|
|
return sys_pwrite64(fd, ubuf, count, ((loff_t)high << 32) | low);
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE6(sync_file_range2, int, fd, unsigned int, flags,
|
|
u32, offset_lo, u32, offset_hi,
|
|
u32, nbytes_lo, u32, nbytes_hi)
|
|
{
|
|
return sys_sync_file_range(fd, ((loff_t)offset_hi << 32) | offset_lo,
|
|
((loff_t)nbytes_hi << 32) | nbytes_lo,
|
|
flags);
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE6(fallocate, int, fd, int, mode,
|
|
u32, offset_lo, u32, offset_hi,
|
|
u32, len_lo, u32, len_hi)
|
|
{
|
|
return sys_fallocate(fd, mode, ((loff_t)offset_hi << 32) | offset_lo,
|
|
((loff_t)len_hi << 32) | len_lo);
|
|
}
|
|
|
|
/*
|
|
* Avoid bug in generic sys_llseek() that specifies offset_high and
|
|
* offset_low as "unsigned long", thus making it possible to pass
|
|
* a sign-extended high 32 bits in offset_low.
|
|
*/
|
|
COMPAT_SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned int, offset_high,
|
|
unsigned int, offset_low, loff_t __user *, result,
|
|
unsigned int, origin)
|
|
{
|
|
return sys_llseek(fd, offset_high, offset_low, result, origin);
|
|
}
|
|
|
|
/* Provide the compat syscall number to call mapping. */
|
|
#undef __SYSCALL
|
|
#define __SYSCALL(nr, call) [nr] = (call),
|
|
|
|
/* See comments in sys.c */
|
|
#define compat_sys_fadvise64_64 sys32_fadvise64_64
|
|
#define compat_sys_readahead sys32_readahead
|
|
#define sys_llseek compat_sys_llseek
|
|
|
|
/* Call the assembly trampolines where necessary. */
|
|
#define compat_sys_rt_sigreturn _compat_sys_rt_sigreturn
|
|
#define sys_clone _sys_clone
|
|
|
|
/*
|
|
* Note that we can't include <linux/unistd.h> here since the header
|
|
* guard will defeat us; <asm/unistd.h> checks for __SYSCALL as well.
|
|
*/
|
|
void *compat_sys_call_table[__NR_syscalls] = {
|
|
[0 ... __NR_syscalls-1] = sys_ni_syscall,
|
|
#include <asm/unistd.h>
|
|
};
|