mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
x86: clean up arch/x86/ia32/sys_ia32.c
White space and coding style clenaup. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner
Ingo Molnar
parent
5de15d42e4
commit
c202f298de
2 changed files with 256 additions and 244 deletions
|
|
@ -16,8 +16,8 @@
|
|||
*
|
||||
* This file assumes that there is a hole at the end of user address space.
|
||||
*
|
||||
* Some of the functions are LE specific currently. These are hopefully all marked.
|
||||
* This should be fixed.
|
||||
* Some of the functions are LE specific currently. These are
|
||||
* hopefully all marked. This should be fixed.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
|
@ -110,23 +110,24 @@ int cp_compat_stat(struct kstat *kbuf, struct compat_stat __user *ubuf)
|
|||
return 0;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_truncate64(char __user * filename, unsigned long offset_low, unsigned long offset_high)
|
||||
asmlinkage long sys32_truncate64(char __user *filename,
|
||||
unsigned long offset_low,
|
||||
unsigned long offset_high)
|
||||
{
|
||||
return sys_truncate(filename, ((loff_t) offset_high << 32) | offset_low);
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_ftruncate64(unsigned int fd, unsigned long offset_low, unsigned long offset_high)
|
||||
asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
|
||||
unsigned long offset_high)
|
||||
{
|
||||
return sys_ftruncate(fd, ((loff_t) offset_high << 32) | offset_low);
|
||||
}
|
||||
|
||||
/* Another set for IA32/LFS -- x86_64 struct stat is different due to
|
||||
support for 64bit inode numbers. */
|
||||
|
||||
static int
|
||||
cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
|
||||
/*
|
||||
* Another set for IA32/LFS -- x86_64 struct stat is different due to
|
||||
* support for 64bit inode numbers.
|
||||
*/
|
||||
static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
|
||||
{
|
||||
typeof(ubuf->st_uid) uid = 0;
|
||||
typeof(ubuf->st_gid) gid = 0;
|
||||
|
|
@ -154,18 +155,19 @@ cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
|
|||
return 0;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_stat64(char __user * filename, struct stat64 __user *statbuf)
|
||||
asmlinkage long sys32_stat64(char __user *filename,
|
||||
struct stat64 __user *statbuf)
|
||||
{
|
||||
struct kstat stat;
|
||||
int ret = vfs_stat(filename, &stat);
|
||||
|
||||
if (!ret)
|
||||
ret = cp_stat64(statbuf, &stat);
|
||||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_lstat64(char __user * filename, struct stat64 __user *statbuf)
|
||||
asmlinkage long sys32_lstat64(char __user *filename,
|
||||
struct stat64 __user *statbuf)
|
||||
{
|
||||
struct kstat stat;
|
||||
int ret = vfs_lstat(filename, &stat);
|
||||
|
|
@ -174,8 +176,7 @@ sys32_lstat64(char __user * filename, struct stat64 __user *statbuf)
|
|||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_fstat64(unsigned int fd, struct stat64 __user *statbuf)
|
||||
asmlinkage long sys32_fstat64(unsigned int fd, struct stat64 __user *statbuf)
|
||||
{
|
||||
struct kstat stat;
|
||||
int ret = vfs_fstat(fd, &stat);
|
||||
|
|
@ -184,8 +185,7 @@ sys32_fstat64(unsigned int fd, struct stat64 __user *statbuf)
|
|||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_fstatat(unsigned int dfd, char __user *filename,
|
||||
asmlinkage long sys32_fstatat(unsigned int dfd, char __user *filename,
|
||||
struct stat64 __user *statbuf, int flag)
|
||||
{
|
||||
struct kstat stat;
|
||||
|
|
@ -221,8 +221,7 @@ struct mmap_arg_struct {
|
|||
unsigned int offset;
|
||||
};
|
||||
|
||||
asmlinkage long
|
||||
sys32_mmap(struct mmap_arg_struct __user *arg)
|
||||
asmlinkage long sys32_mmap(struct mmap_arg_struct __user *arg)
|
||||
{
|
||||
struct mmap_arg_struct a;
|
||||
struct file *file = NULL;
|
||||
|
|
@ -243,7 +242,8 @@ sys32_mmap(struct mmap_arg_struct __user *arg)
|
|||
|
||||
mm = current->mm;
|
||||
down_write(&mm->mmap_sem);
|
||||
retval = do_mmap_pgoff(file, a.addr, a.len, a.prot, a.flags, a.offset>>PAGE_SHIFT);
|
||||
retval = do_mmap_pgoff(file, a.addr, a.len, a.prot, a.flags,
|
||||
a.offset>>PAGE_SHIFT);
|
||||
if (file)
|
||||
fput(file);
|
||||
|
||||
|
|
@ -252,14 +252,13 @@ sys32_mmap(struct mmap_arg_struct __user *arg)
|
|||
return retval;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_mprotect(unsigned long start, size_t len, unsigned long prot)
|
||||
asmlinkage long sys32_mprotect(unsigned long start, size_t len,
|
||||
unsigned long prot)
|
||||
{
|
||||
return sys_mprotect(start, len, prot);
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_pipe(int __user *fd)
|
||||
asmlinkage long sys32_pipe(int __user *fd)
|
||||
{
|
||||
int retval;
|
||||
int fds[2];
|
||||
|
|
@ -273,9 +272,9 @@ sys32_pipe(int __user *fd)
|
|||
return retval;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_rt_sigaction(int sig, struct sigaction32 __user *act,
|
||||
struct sigaction32 __user *oact, unsigned int sigsetsize)
|
||||
asmlinkage long sys32_rt_sigaction(int sig, struct sigaction32 __user *act,
|
||||
struct sigaction32 __user *oact,
|
||||
unsigned int sigsetsize)
|
||||
{
|
||||
struct k_sigaction new_ka, old_ka;
|
||||
int ret;
|
||||
|
|
@ -292,11 +291,16 @@ sys32_rt_sigaction(int sig, struct sigaction32 __user *act,
|
|||
__get_user(handler, &act->sa_handler) ||
|
||||
__get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
|
||||
__get_user(restorer, &act->sa_restorer) ||
|
||||
__copy_from_user(&set32, &act->sa_mask, sizeof(compat_sigset_t)))
|
||||
__copy_from_user(&set32, &act->sa_mask,
|
||||
sizeof(compat_sigset_t)))
|
||||
return -EFAULT;
|
||||
new_ka.sa.sa_handler = compat_ptr(handler);
|
||||
new_ka.sa.sa_restorer = compat_ptr(restorer);
|
||||
/* FIXME: here we rely on _COMPAT_NSIG_WORS to be >= than _NSIG_WORDS << 1 */
|
||||
|
||||
/*
|
||||
* FIXME: here we rely on _COMPAT_NSIG_WORS to be >=
|
||||
* than _NSIG_WORDS << 1
|
||||
*/
|
||||
switch (_NSIG_WORDS) {
|
||||
case 4: new_ka.sa.sa_mask.sig[3] = set32.sig[6]
|
||||
| (((long)set32.sig[7]) << 32);
|
||||
|
|
@ -312,7 +316,10 @@ sys32_rt_sigaction(int sig, struct sigaction32 __user *act,
|
|||
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
|
||||
|
||||
if (!ret && oact) {
|
||||
/* FIXME: here we rely on _COMPAT_NSIG_WORS to be >= than _NSIG_WORDS << 1 */
|
||||
/*
|
||||
* FIXME: here we rely on _COMPAT_NSIG_WORS to be >=
|
||||
* than _NSIG_WORDS << 1
|
||||
*/
|
||||
switch (_NSIG_WORDS) {
|
||||
case 4:
|
||||
set32.sig[7] = (old_ka.sa.sa_mask.sig[3] >> 32);
|
||||
|
|
@ -328,18 +335,21 @@ sys32_rt_sigaction(int sig, struct sigaction32 __user *act,
|
|||
set32.sig[0] = old_ka.sa.sa_mask.sig[0];
|
||||
}
|
||||
if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_handler), &oact->sa_handler) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_restorer), &oact->sa_restorer) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_handler),
|
||||
&oact->sa_handler) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_restorer),
|
||||
&oact->sa_restorer) ||
|
||||
__put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
|
||||
__copy_to_user(&oact->sa_mask, &set32, sizeof(compat_sigset_t)))
|
||||
__copy_to_user(&oact->sa_mask, &set32,
|
||||
sizeof(compat_sigset_t)))
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_sigaction (int sig, struct old_sigaction32 __user *act, struct old_sigaction32 __user *oact)
|
||||
asmlinkage long sys32_sigaction(int sig, struct old_sigaction32 __user *act,
|
||||
struct old_sigaction32 __user *oact)
|
||||
{
|
||||
struct k_sigaction new_ka, old_ka;
|
||||
int ret;
|
||||
|
|
@ -365,8 +375,10 @@ sys32_sigaction (int sig, struct old_sigaction32 __user *act, struct old_sigacti
|
|||
|
||||
if (!ret && oact) {
|
||||
if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_handler), &oact->sa_handler) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_restorer), &oact->sa_restorer) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_handler),
|
||||
&oact->sa_handler) ||
|
||||
__put_user(ptr_to_compat(old_ka.sa.sa_restorer),
|
||||
&oact->sa_restorer) ||
|
||||
__put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
|
||||
__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
|
||||
return -EFAULT;
|
||||
|
|
@ -375,9 +387,9 @@ sys32_sigaction (int sig, struct old_sigaction32 __user *act, struct old_sigacti
|
|||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
|
||||
compat_sigset_t __user *oset, unsigned int sigsetsize)
|
||||
asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
|
||||
compat_sigset_t __user *oset,
|
||||
unsigned int sigsetsize)
|
||||
{
|
||||
sigset_t s;
|
||||
compat_sigset_t s32;
|
||||
|
|
@ -400,7 +412,8 @@ sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
|
|||
oset ? (sigset_t __user *)&s : NULL,
|
||||
sigsetsize);
|
||||
set_fs(old_fs);
|
||||
if (ret) return ret;
|
||||
if (ret)
|
||||
return ret;
|
||||
if (oset) {
|
||||
switch (_NSIG_WORDS) {
|
||||
case 4: s32.sig[7] = (s.sig[3] >> 32); s32.sig[6] = s.sig[3];
|
||||
|
|
@ -414,10 +427,10 @@ sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline long
|
||||
get_tv32(struct timeval *o, struct compat_timeval __user *i)
|
||||
static inline long get_tv32(struct timeval *o, struct compat_timeval __user *i)
|
||||
{
|
||||
int err = -EFAULT;
|
||||
|
||||
if (access_ok(VERIFY_READ, i, sizeof(*i))) {
|
||||
err = __get_user(o->tv_sec, &i->tv_sec);
|
||||
err |= __get_user(o->tv_usec, &i->tv_usec);
|
||||
|
|
@ -425,10 +438,10 @@ get_tv32(struct timeval *o, struct compat_timeval __user *i)
|
|||
return err;
|
||||
}
|
||||
|
||||
static inline long
|
||||
put_tv32(struct compat_timeval __user *o, struct timeval *i)
|
||||
static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)
|
||||
{
|
||||
int err = -EFAULT;
|
||||
|
||||
if (access_ok(VERIFY_WRITE, o, sizeof(*o))) {
|
||||
err = __put_user(i->tv_sec, &o->tv_sec);
|
||||
err |= __put_user(i->tv_usec, &o->tv_usec);
|
||||
|
|
@ -436,24 +449,21 @@ put_tv32(struct compat_timeval __user *o, struct timeval *i)
|
|||
return err;
|
||||
}
|
||||
|
||||
extern unsigned int alarm_setitimer(unsigned int seconds);
|
||||
|
||||
asmlinkage long
|
||||
sys32_alarm(unsigned int seconds)
|
||||
asmlinkage long sys32_alarm(unsigned int seconds)
|
||||
{
|
||||
return alarm_setitimer(seconds);
|
||||
}
|
||||
|
||||
/* Translations due to time_t size differences. Which affects all
|
||||
sorts of things, like timeval and itimerval. */
|
||||
|
||||
extern struct timezone sys_tz;
|
||||
|
||||
asmlinkage long
|
||||
sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
|
||||
/*
|
||||
* Translations due to time_t size differences. Which affects all
|
||||
* sorts of things, like timeval and itimerval.
|
||||
*/
|
||||
asmlinkage long sys32_gettimeofday(struct compat_timeval __user *tv,
|
||||
struct timezone __user *tz)
|
||||
{
|
||||
if (tv) {
|
||||
struct timeval ktv;
|
||||
|
||||
do_gettimeofday(&ktv);
|
||||
if (put_tv32(tv, &ktv))
|
||||
return -EFAULT;
|
||||
|
|
@ -465,8 +475,8 @@ sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
|
|||
return 0;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
|
||||
asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv,
|
||||
struct timezone __user *tz)
|
||||
{
|
||||
struct timeval ktv;
|
||||
struct timespec kts;
|
||||
|
|
@ -494,8 +504,7 @@ struct sel_arg_struct {
|
|||
unsigned int tvp;
|
||||
};
|
||||
|
||||
asmlinkage long
|
||||
sys32_old_select(struct sel_arg_struct __user *arg)
|
||||
asmlinkage long sys32_old_select(struct sel_arg_struct __user *arg)
|
||||
{
|
||||
struct sel_arg_struct a;
|
||||
|
||||
|
|
@ -505,26 +514,21 @@ sys32_old_select(struct sel_arg_struct __user *arg)
|
|||
compat_ptr(a.exp), compat_ptr(a.tvp));
|
||||
}
|
||||
|
||||
extern asmlinkage long
|
||||
compat_sys_wait4(compat_pid_t pid, compat_uint_t * stat_addr, int options,
|
||||
struct compat_rusage *ru);
|
||||
|
||||
asmlinkage long
|
||||
sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr, int options)
|
||||
asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
|
||||
int options)
|
||||
{
|
||||
return compat_sys_wait4(pid, stat_addr, options, NULL);
|
||||
}
|
||||
|
||||
/* 32-bit timeval and related flotsam. */
|
||||
|
||||
asmlinkage long
|
||||
sys32_sysfs(int option, u32 arg1, u32 arg2)
|
||||
asmlinkage long sys32_sysfs(int option, u32 arg1, u32 arg2)
|
||||
{
|
||||
return sys_sysfs(option, arg1, arg2);
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_sched_rr_get_interval(compat_pid_t pid, struct compat_timespec __user *interval)
|
||||
asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
|
||||
struct compat_timespec __user *interval)
|
||||
{
|
||||
struct timespec t;
|
||||
int ret;
|
||||
|
|
@ -538,8 +542,8 @@ sys32_sched_rr_get_interval(compat_pid_t pid, struct compat_timespec __user *int
|
|||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_rt_sigpending(compat_sigset_t __user *set, compat_size_t sigsetsize)
|
||||
asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
|
||||
compat_size_t sigsetsize)
|
||||
{
|
||||
sigset_t s;
|
||||
compat_sigset_t s32;
|
||||
|
|
@ -562,8 +566,8 @@ sys32_rt_sigpending(compat_sigset_t __user *set, compat_size_t sigsetsize)
|
|||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo)
|
||||
asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
|
||||
compat_siginfo_t __user *uinfo)
|
||||
{
|
||||
siginfo_t info;
|
||||
int ret;
|
||||
|
|
@ -578,8 +582,7 @@ sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo)
|
|||
}
|
||||
|
||||
/* These are here just in case some old ia32 binary calls it. */
|
||||
asmlinkage long
|
||||
sys32_pause(void)
|
||||
asmlinkage long sys32_pause(void)
|
||||
{
|
||||
current->state = TASK_INTERRUPTIBLE;
|
||||
schedule();
|
||||
|
|
@ -599,8 +602,7 @@ struct sysctl_ia32 {
|
|||
};
|
||||
|
||||
|
||||
asmlinkage long
|
||||
sys32_sysctl(struct sysctl_ia32 __user *args32)
|
||||
asmlinkage long sys32_sysctl(struct sysctl_ia32 __user *args32)
|
||||
{
|
||||
struct sysctl_ia32 a32;
|
||||
mm_segment_t old_fs = get_fs();
|
||||
|
|
@ -613,11 +615,12 @@ sys32_sysctl(struct sysctl_ia32 __user *args32)
|
|||
return -EFAULT;
|
||||
|
||||
/*
|
||||
* We need to pre-validate these because we have to disable address checking
|
||||
* before calling do_sysctl() because of OLDLEN but we can't run the risk of the
|
||||
* user specifying bad addresses here. Well, since we're dealing with 32 bit
|
||||
* addresses, we KNOW that access_ok() will always succeed, so this is an
|
||||
* expensive NOP, but so what...
|
||||
* We need to pre-validate these because we have to disable
|
||||
* address checking before calling do_sysctl() because of
|
||||
* OLDLEN but we can't run the risk of the user specifying bad
|
||||
* addresses here. Well, since we're dealing with 32 bit
|
||||
* addresses, we KNOW that access_ok() will always succeed, so
|
||||
* this is an expensive NOP, but so what...
|
||||
*/
|
||||
namep = compat_ptr(a32.name);
|
||||
oldvalp = compat_ptr(a32.oldval);
|
||||
|
|
@ -644,25 +647,25 @@ sys32_sysctl(struct sysctl_ia32 __user *args32)
|
|||
#endif
|
||||
|
||||
/* warning: next two assume little endian */
|
||||
asmlinkage long
|
||||
sys32_pread(unsigned int fd, char __user *ubuf, u32 count, u32 poslo, u32 poshi)
|
||||
asmlinkage long sys32_pread(unsigned int fd, char __user *ubuf, u32 count,
|
||||
u32 poslo, u32 poshi)
|
||||
{
|
||||
return sys_pread64(fd, ubuf, count,
|
||||
((loff_t)AA(poshi) << 32) | AA(poslo));
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_pwrite(unsigned int fd, char __user *ubuf, u32 count, u32 poslo, u32 poshi)
|
||||
asmlinkage long sys32_pwrite(unsigned int fd, char __user *ubuf, u32 count,
|
||||
u32 poslo, u32 poshi)
|
||||
{
|
||||
return sys_pwrite64(fd, ubuf, count,
|
||||
((loff_t)AA(poshi) << 32) | AA(poslo));
|
||||
}
|
||||
|
||||
|
||||
asmlinkage long
|
||||
sys32_personality(unsigned long personality)
|
||||
asmlinkage long sys32_personality(unsigned long personality)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (personality(current->personality) == PER_LINUX32 &&
|
||||
personality == PER_LINUX)
|
||||
personality = PER_LINUX32;
|
||||
|
|
@ -672,8 +675,8 @@ sys32_personality(unsigned long personality)
|
|||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long
|
||||
sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count)
|
||||
asmlinkage long sys32_sendfile(int out_fd, int in_fd,
|
||||
compat_off_t __user *offset, s32 count)
|
||||
{
|
||||
mm_segment_t old_fs = get_fs();
|
||||
int ret;
|
||||
|
|
@ -689,7 +692,6 @@ sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count)
|
|||
|
||||
if (offset && put_user(of, offset))
|
||||
return -EFAULT;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -719,6 +721,7 @@ asmlinkage long sys32_mmap2(unsigned long addr, unsigned long len,
|
|||
|
||||
asmlinkage long sys32_olduname(struct oldold_utsname __user *name)
|
||||
{
|
||||
char *arch = "x86_64";
|
||||
int err;
|
||||
|
||||
if (!name)
|
||||
|
|
@ -740,13 +743,11 @@ asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
|
|||
err |= __copy_to_user(&name->version, &utsname()->version,
|
||||
__OLD_UTS_LEN);
|
||||
err |= __put_user(0, name->version+__OLD_UTS_LEN);
|
||||
{
|
||||
char *arch = "x86_64";
|
||||
|
||||
if (personality(current->personality) == PER_LINUX32)
|
||||
arch = "i686";
|
||||
|
||||
err |= __copy_to_user(&name->machine, arch, strlen(arch) + 1);
|
||||
}
|
||||
|
||||
up_read(&uts_sem);
|
||||
|
||||
|
|
@ -758,6 +759,7 @@ asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
|
|||
long sys32_uname(struct old_utsname __user *name)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!name)
|
||||
return -EFAULT;
|
||||
down_read(&uts_sem);
|
||||
|
|
@ -765,6 +767,7 @@ long sys32_uname(struct old_utsname __user * name)
|
|||
up_read(&uts_sem);
|
||||
if (personality(current->personality) == PER_LINUX32)
|
||||
err |= copy_to_user(&name->machine, "i686", 5);
|
||||
|
||||
return err ? -EFAULT : 0;
|
||||
}
|
||||
|
||||
|
|
@ -778,14 +781,15 @@ long sys32_ustat(unsigned dev, struct ustat32 __user *u32p)
|
|||
set_fs(KERNEL_DS);
|
||||
ret = sys_ustat(dev, (struct ustat __user *)&u);
|
||||
set_fs(seg);
|
||||
if (ret >= 0) {
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (!access_ok(VERIFY_WRITE, u32p, sizeof(struct ustat32)) ||
|
||||
__put_user((__u32) u.f_tfree, &u32p->f_tfree) ||
|
||||
__put_user((__u32) u.f_tinode, &u32p->f_tfree) ||
|
||||
__copy_to_user(&u32p->f_fname, u.f_fname, sizeof(u.f_fname)) ||
|
||||
__copy_to_user(&u32p->f_fpack, u.f_fpack, sizeof(u.f_fpack)))
|
||||
ret = -EFAULT;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -814,15 +818,16 @@ asmlinkage long sys32_clone(unsigned int clone_flags, unsigned int newsp,
|
|||
{
|
||||
void __user *parent_tid = (void __user *)regs->rdx;
|
||||
void __user *child_tid = (void __user *)regs->rdi;
|
||||
|
||||
if (!newsp)
|
||||
newsp = regs->rsp;
|
||||
return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid);
|
||||
}
|
||||
|
||||
/*
|
||||
* Some system calls that need sign extended arguments. This could be done by a generic wrapper.
|
||||
* Some system calls that need sign extended arguments. This could be
|
||||
* done by a generic wrapper.
|
||||
*/
|
||||
|
||||
long sys32_lseek(unsigned int fd, int offset, unsigned int whence)
|
||||
{
|
||||
return sys_lseek(fd, offset, whence);
|
||||
|
|
@ -846,8 +851,10 @@ long sys32_vm86_warning(void)
|
|||
{
|
||||
struct task_struct *me = current;
|
||||
static char lastcomm[sizeof(me->comm)];
|
||||
|
||||
if (strncmp(lastcomm, me->comm, sizeof(lastcomm))) {
|
||||
compat_printk(KERN_INFO "%s: vm86 mode not supported on 64 bit kernel\n",
|
||||
compat_printk(KERN_INFO
|
||||
"%s: vm86 mode not supported on 64 bit kernel\n",
|
||||
me->comm);
|
||||
strncpy(lastcomm, me->comm, sizeof(lastcomm));
|
||||
}
|
||||
|
|
@ -860,7 +867,8 @@ long sys32_lookup_dcookie(u32 addr_low, u32 addr_high,
|
|||
return sys_lookup_dcookie(((u64)addr_high << 32) | addr_low, buf, len);
|
||||
}
|
||||
|
||||
asmlinkage ssize_t sys32_readahead(int fd, unsigned off_lo, unsigned off_hi, size_t count)
|
||||
asmlinkage ssize_t sys32_readahead(int fd, unsigned off_lo, unsigned off_hi,
|
||||
size_t count)
|
||||
{
|
||||
return sys_readahead(fd, ((u64)off_hi << 32) | off_lo, count);
|
||||
}
|
||||
|
|
@ -873,8 +881,8 @@ asmlinkage long sys32_sync_file_range(int fd, unsigned off_low, unsigned off_hi,
|
|||
((u64)n_hi << 32) | n_low, flags);
|
||||
}
|
||||
|
||||
asmlinkage long sys32_fadvise64(int fd, unsigned offset_lo, unsigned offset_hi, size_t len,
|
||||
int advice)
|
||||
asmlinkage long sys32_fadvise64(int fd, unsigned offset_lo, unsigned offset_hi,
|
||||
size_t len, int advice)
|
||||
{
|
||||
return sys_fadvise64_64(fd, ((u64)offset_hi << 32) | offset_lo,
|
||||
len, advice);
|
||||
|
|
|
|||
|
|
@ -191,6 +191,10 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
|
|||
compat_ulong_t __user *outp, compat_ulong_t __user *exp,
|
||||
struct compat_timeval __user *tvp);
|
||||
|
||||
asmlinkage long compat_sys_wait4(compat_pid_t pid,
|
||||
compat_uint_t *stat_addr, int options,
|
||||
struct compat_rusage *ru);
|
||||
|
||||
#define BITS_PER_COMPAT_LONG (8*sizeof(compat_long_t))
|
||||
|
||||
#define BITS_TO_COMPAT_LONGS(bits) \
|
||||
|
|
|
|||
Loading…
Reference in a new issue