generic sys_olduname
PATCH 6/6 generic sys_olduname
Add generic implementations of the old and really old uname system calls. Note that sh only implements sys_olduname but not sys_oldolduname, but I'm not going to bother with another ifdef for that special case.
m32r implemented an old uname but never wired it up, so kill it, too.
Signed-off-by Christoph Hellwig <[email protected]>
arch/mips/kernel/syscall.c +0 -42
@@ -215,48 +215,6 @@ out:return error; } -/* -* Compacrapability ... -*/ -SYSCALL_DEFINE1(uname, struct old_utsname __user *, name) -{ -if (name && !copy_to_user (name,utsname (),sizeof (*name))) -return 0 ; -return -EFAULT ; -} - -/* -* Compacrapability ... -*/ -SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name) -{ -int error; - -if (!name) -return -EFAULT ; -if (!access_ok (VERIFY_WRITE , name,sizeof (struct oldold_utsname ))) -return -EFAULT ; - - error =__copy_to_user (&name->sysname, &utsname ()->sysname, - __OLD_UTS_LEN); - error -=__put_user (0 , name->sysname + __OLD_UTS_LEN); - error -=__copy_to_user (&name->nodename, &utsname ()->nodename, - __OLD_UTS_LEN); - error -=__put_user (0 , name->nodename + __OLD_UTS_LEN); - error -=__copy_to_user (&name->release, &utsname ()->release, - __OLD_UTS_LEN); - error -=__put_user (0 , name->release + __OLD_UTS_LEN); - error -=__copy_to_user (&name->version, &utsname ()->version, - __OLD_UTS_LEN); - error -=__put_user (0 , name->version + __OLD_UTS_LEN); - error -=__copy_to_user (&name->machine, &utsname ()->machine, - __OLD_UTS_LEN); - error =__put_user (0 , name->machine + __OLD_UTS_LEN); - error = error ? -EFAULT :0 ; - -return error; -} - SYSCALL_DEFINE1(set_thread_area, unsigned long, addr) {struct thread_info *ti =task_thread_info (current);
arch/powerpc/kernel/syscalls.c +0 -57
63 lines not on this page · raw message
arch/x86/ia32/ia32entry.S +2 -2
@@ -563,7 +563,7 @@ ia32_sys_call_table: .quad quiet_ni_syscall /* old mpx syscall holder */ .quad sys_setpgid .quad quiet_ni_syscall /* old ulimit syscall holder */ - .quad sys32_olduname + .quad sys_olduname .quad sys_umask /* 60 */ .quad sys_chroot .quad compat_sys_ustat
@@ -613,7 +613,7 @@ ia32_sys_call_table: .quad compat_sys_newstat .quad compat_sys_newlstat .quad compat_sys_newfstat - .quad sys32_uname + .quad sys_uname .quad stub32_iopl /* 110 */ .quad sys_vhangup .quad quiet_ni_syscall /* old "idle" system call */
arch/x86/ia32/sys_ia32.c +0 -52
58 lines not on this page · raw message
arch/x86/include/asm/sys_ia32.h +0 -5
@@ -53,11 +53,6 @@ asmlinkage long sys32_pwrite(unsigned inasmlinkage long sys32_sendfile (int ,int ,compat_off_t __user *,s32 ); -struct oldold_utsname ; -struct old_utsname ; -asmlinkage long sys32_olduname (struct oldold_utsname __user *); -long sys32_uname (struct old_utsname __user *); -asmlinkage long sys32_execve (char __user *,compat_uptr_t __user *,compat_uptr_t __user *,struct pt_regs *);asmlinkage long sys32_clone (unsigned int ,unsigned int ,struct pt_regs *);
arch/x86/include/asm/syscalls.h +0 -7
@@ -50,13 +50,6 @@ asmlinkage int sys_sigaction(int, const struct old_sigaction __user *);unsigned long sys_sigreturn (struct pt_regs *); -/* kernel/sys_i386_32.c */ -struct oldold_utsname ; -struct old_utsname ; - -asmlinkage int sys_uname(struct old_utsname __user *); -asmlinkage int sys_olduname(struct oldold_utsname __user *); -/* kernel/vm86_32.c */ int sys_vm86old (struct vm86_struct __user *,struct pt_regs *);int sys_vm86 (unsigned long ,unsigned long ,struct pt_regs *);
arch/x86/kernel/sys_i386_32.c +0 -49
55 lines not on this page · raw message
include/linux/syscalls.h +4 -0
@@ -31,6 +31,8 @@ struct msqid_ds;struct new_utsname ;struct nfsctl_arg ;struct __old_kernel_stat ; +struct oldold_utsname ; +struct old_utsname ;struct pollfd ;struct rlimit ;struct rusage ;
@@ -655,6 +657,8 @@ asmlinkage long sys_gethostname(char __uasmlinkage long sys_sethostname (char __user *name,int len);asmlinkage long sys_setdomainname (char __user *name,int len);asmlinkage long sys_newuname (struct new_utsname __user *name); +asmlinkage long sys_uname (struct old_utsname __user *); +asmlinkage long sys_olduname (struct oldold_utsname __user *);asmlinkage long sys_getrlimit (unsigned int resource,struct rlimit __user *rlim);
kernel/sys.c +54 -0
60 lines not on this page · raw message
arch/m32r/kernel/sys_m32r.c +0 -11
@@ -76,17 +76,6 @@ asmlinkage int sys_tas(int __user *addr)return oldval; } -asmlinkage int sys_uname(struct old_utsname __user * name) -{ -int err; -if (!name) -return -EFAULT ; -down_read (&uts_sem); - err =copy_to_user (name,utsname (),sizeof (*name)); -up_read (&uts_sem); -return err?-EFAULT :0 ; -} - asmlinkage int sys_cacheflush(void *addr, int bytes, int cache) {/* This should flush more selectively ... */
arch/sh/include/asm/syscalls.h +0 -3
@@ -3,15 +3,12 @@#ifdef __KERNEL__ -struct old_utsname ; - asmlinkage int old_mmap(unsigned long addr, unsigned long len,unsigned long prot,unsigned long flags,int fd,unsigned long off);asmlinkage long sys_mmap2 (unsigned long addr,unsigned long len,unsigned long prot,unsigned long flags,unsigned long fd,unsigned long pgoff); -asmlinkage int sys_uname(struct old_utsname __user *name);#ifdef CONFIG_SUPERH32 # include "syscalls_32.h"
arch/sh/kernel/sys_sh.c +0 -11
@@ -93,14 +93,3 @@ asmlinkage int sys_cacheflush(unsigned lup_read (¤t->mm->mmap_sem);return 0 ; } - -asmlinkage int sys_uname(struct old_utsname __user *name) -{ -int err; -if (!name) -return -EFAULT ; -down_read (&uts_sem); - err =copy_to_user (name,utsname (),sizeof (*name)); -up_read (&uts_sem); -return err?-EFAULT :0 ; -}
arch/um/kernel/syscall.c +0 -45
51 lines not on this page · raw message
arch/mips/include/asm/unistd.h +1 -0
@@ -1014,6 +1014,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_UNAME#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK
arch/powerpc/include/asm/unistd.h +1 -0
@@ -377,6 +377,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_UNAME#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK
arch/sh/include/asm/unistd_32.h +1 -0
@@ -371,6 +371,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_UNAME#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK
arch/sh/include/asm/unistd_64.h +1 -0
@@ -411,6 +411,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_UNAME#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK
arch/x86/include/asm/unistd_32.h +1 -0
@@ -367,6 +367,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_UNAME#define __ARCH_WANT_SYS_OLD_MMAP#define __ARCH_WANT_SYS_OLD_SELECT#define __ARCH_WANT_SYS_OLDUMOUNT
arch/x86/include/asm/unistd_64.h +1 -0
@@ -680,6 +680,7 @@ __SYSCALL(__NR_recvmmsg, sys_recvmmsg)#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_UNAME#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK