generic sys_old_mmap
Subsystems (9)
PATCH 2/6 generic sys_old_mmap
Add a generic implementation of the old mmap syscall, which expects it's argument in a memory block and switch all architectures over to use it.
include/linux/syscalls.h +3 -0
@@ -23,6 +23,7 @@ struct kexec_segment;struct linux_dirent ;struct linux_dirent64 ;struct list_head ; +struct mmap_arg_struct ;struct msgbuf ;struct msghdr ;struct mmsghdr ;
@@ -838,4 +839,6 @@ asmlinkage long sys_perf_event_open(asmlinkage long sys_mmap_pgoff (unsigned long addr,unsigned long len,unsigned long prot,unsigned long flags,unsigned long fd,unsigned long pgoff); +asmlinkage long sys_old_mmap (struct mmap_arg_struct __user *arg); +#endif
mm/mmap.c +24 -0
@@ -1083,6 +1083,30 @@ out:return retval; } +#ifdef __ARCH_WANT_SYS_OLD_MMAP +struct mmap_arg_struct { +unsigned long addr; +unsigned long len; +unsigned long prot; +unsigned long flags; +unsigned long fd; +unsigned long offset; +}; + +SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg) +{ +struct mmap_arg_struct a; + +if (copy_from_user (&a, arg,sizeof (a))) +return -EFAULT ; +if (a.offset & ~PAGE_MASK ) +return -EINVAL ; + +return sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, a.fd, + a.offset >>PAGE_SHIFT ); +} +#endif /* __ARCH_WANT_SYS_OLD_MMAP */ +/* * Some shared mappigns will want the pages marked read-only * to track write events. If so, we'll downgrade vm_page_prot
arch/arm/include/asm/unistd.h +1 -0
@@ -443,6 +443,7 @@#define __ARCH_WANT_SYS_SIGPROCMASK#define __ARCH_WANT_SYS_RT_SIGACTION#define __ARCH_WANT_SYS_RT_SIGSUSPEND +#define __ARCH_WANT_SYS_OLD_MMAP#define __ARCH_WANT_SYS_OLD_SELECT#if !defined(CONFIG_AEABI ) || defined(CONFIG_OABI_COMPAT )
arch/arm/kernel/calls.S +1 -1
@@ -99,7 +99,7 @@ CALL(sys_swapon) CALL(sys_reboot) CALL(OBSOLETE(sys_old_readdir)) /* used by libc4 */ -/* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */ +/* 90 */ CALL(OBSOLETE(sys_old_mmap)) /* used by libc4 */ CALL(sys_munmap) CALL(sys_truncate) CALL(sys_ftruncate)
arch/arm/kernel/sys_arm.c +0 -26
@@ -28,32 +28,6 @@#include <linux/ipc.h> #include <linux/uaccess.h> -struct mmap_arg_struct { -unsigned long addr; -unsigned long len; -unsigned long prot; -unsigned long flags; -unsigned long fd; -unsigned long offset; -}; - -asmlinkage int old_mmap(struct mmap_arg_struct __user *arg) -{ -int error = -EFAULT ; -struct mmap_arg_struct a; - -if (copy_from_user (&a, arg,sizeof (a))) - goto out; - - error = -EINVAL ; -if (a.offset & ~PAGE_MASK ) - goto out; - - error =sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, a.fd, a.offset >>PAGE_SHIFT ); -out: -return error; -} -#if !defined(CONFIG_AEABI ) || defined(CONFIG_OABI_COMPAT )/* * sys_ipc() is the de-multiplexer for the SysV IPC calls..
arch/cris/arch-v10/kernel/entry.S +1 -1
@@ -692,7 +692,7 @@ sys_call_table: .long sys_swapon .long sys_reboot .long sys_old_readdir - .long old_mmap /* 90 */ + .long sys_old_mmap /* 90 */ .long sys_munmap .long sys_truncate .long sys_ftruncate
arch/cris/arch-v32/kernel/entry.S +1 -1
@@ -615,7 +615,7 @@ sys_call_table: .long sys_swapon .long sys_reboot .long sys_old_readdir - .long old_mmap /* 90 */ + .long sys_old_mmap /* 90 */ .long sys_munmap .long sys_truncate .long sys_ftruncate
arch/cris/include/asm/unistd.h +1 -0
@@ -364,6 +364,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_MMAP#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK
arch/cris/kernel/sys_cris.c +0 -18
@@ -26,24 +26,6 @@#include <asm/uaccess.h> #include <asm/segment.h> -asmlinkage unsigned long old_mmap (unsigned long __user *args) -{ -unsigned long buffer[6 ]; -int err = -EFAULT ; - -if (copy_from_user (&buffer, args,sizeof (buffer))) - goto out; - - err = -EINVAL ; -if (buffer[5 ] & ~PAGE_MASK )/* verify that offset is on page boundary */ - goto out; - - err =sys_mmap_pgoff (buffer[0 ], buffer[1 ], buffer[2 ], buffer[3 ], - buffer[4 ], buffer[5 ] >>PAGE_SHIFT ); -out: -return err; -} -asmlinkage long sys_mmap2 (unsigned long addr,unsigned long len,unsigned long prot,unsigned long flags,unsigned long fd,unsigned long pgoff)
arch/h8300/include/asm/unistd.h +1 -0
@@ -348,6 +348,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_MMAP#define __ARCH_WANT_SYS_OLD_SELECT#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING
arch/h8300/kernel/sys_h8300.c +0 -34
@@ -27,40 +27,6 @@#include <asm/unistd.h> /* -* Perform the select(nd, in, out, ex, tv) and mmap() system -* calls. Linux/m68k cloned Linux/i386, which didn't use to be able to -* handle more than 4 system call parameters, so these system calls -* used a memory block for parameter passing.. -*/ - -struct mmap_arg_struct { -unsigned long addr; -unsigned long len; -unsigned long prot; -unsigned long flags; -unsigned long fd; -unsigned long offset; -}; - -asmlinkage int old_mmap(struct mmap_arg_struct *arg) -{ -struct mmap_arg_struct a; -int error = -EFAULT ; - -if (copy_from_user (&a, arg,sizeof (a))) - goto out; - - error = -EINVAL ; -if (a.offset & ~PAGE_MASK ) - goto out; - - error =sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, a.fd, - a.offset >>PAGE_SHIFT ); -out: -return error; -} - -/* * sys_ipc() is the de-multiplexer for the SysV IPC calls.. * * This is really horribly ugly.
arch/h8300/kernel/syscalls.S +1 -1
@@ -104,7 +104,7 @@ SYMBOL_NAME_LABEL(sys_call_table) .long SYMBOL_NAME(sys_swapon) .long SYMBOL_NAME(sys_reboot) .long SYMBOL_NAME(sys_old_readdir) - .long SYMBOL_NAME(old_mmap) /* 90 */ + .long SYMBOL_NAME(sys_old_mmap) /* 90 */ .long SYMBOL_NAME(sys_munmap) .long SYMBOL_NAME(sys_truncate) .long SYMBOL_NAME(sys_ftruncate)
arch/m68k/kernel/entry.S +1 -1
@@ -518,7 +518,7 @@ sys_call_table: .long sys_swapon .long sys_reboot .long sys_old_readdir - .long old_mmap /* 90 */ + .long sys_old_mmap /* 90 */ .long sys_munmap .long sys_truncate .long sys_ftruncate
arch/m68k/kernel/sys_m68k.c +0 -34
@@ -42,40 +42,6 @@ asmlinkage long sys_mmap2(unsigned long }/* -* Perform the select(nd, in, out, ex, tv) and mmap() system -* calls. Linux/m68k cloned Linux/i386, which didn't use to be able to -* handle more than 4 system call parameters, so these system calls -* used a memory block for parameter passing.. -*/ - -struct mmap_arg_struct { -unsigned long addr; -unsigned long len; -unsigned long prot; -unsigned long flags; -unsigned long fd; -unsigned long offset; -}; - -asmlinkage int old_mmap(struct mmap_arg_struct __user *arg) -{ -struct mmap_arg_struct a; -int error = -EFAULT ; - -if (copy_from_user (&a, arg,sizeof (a))) - goto out; - - error = -EINVAL ; -if (a.offset & ~PAGE_MASK ) - goto out; - - error =sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, a.fd, - a.offset >>PAGE_SHIFT ); -out: -return error; -} - -/* * sys_ipc() is the de-multiplexer for the SysV IPC calls.. * * This is really horribly ugly.
arch/m68knommu/kernel/sys_m68k.c +0 -34
@@ -28,40 +28,6 @@#include <asm/unistd.h> /* -* Perform the select(nd, in, out, ex, tv) and mmap() system -* calls. Linux/m68k cloned Linux/i386, which didn't use to be able to -* handle more than 4 system call parameters, so these system calls -* used a memory block for parameter passing.. -*/ - -struct mmap_arg_struct { -unsigned long addr; -unsigned long len; -unsigned long prot; -unsigned long flags; -unsigned long fd; -unsigned long offset; -}; - -asmlinkage int old_mmap(struct mmap_arg_struct *arg) -{ -struct mmap_arg_struct a; -int error = -EFAULT ; - -if (copy_from_user (&a, arg,sizeof (a))) - goto out; - - error = -EINVAL ; -if (a.offset & ~PAGE_MASK ) - goto out; - - error =sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, a.fd, - a.offset >>PAGE_SHIFT ); -out: -return error; -} - -/* * sys_ipc() is the de-multiplexer for the SysV IPC calls.. * * This is really horribly ugly.
arch/m68knommu/kernel/syscalltable.S +1 -1
@@ -108,7 +108,7 @@ ENTRY(sys_call_table) .long sys_ni_syscall /* sys_swapon */ .long sys_reboot .long sys_old_readdir - .long old_mmap /* 90 */ + .long sys_old_mmap /* 90 */ .long sys_munmap .long sys_truncate .long sys_ftruncate
arch/m68k/include/asm/unistd.h +1 -0
@@ -359,6 +359,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_MMAP#define __ARCH_WANT_SYS_OLD_SELECT#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING
arch/s390/kernel/sys_s390.c +6 -24
@@ -33,13 +33,12 @@#include "entry.h" /* -* Perform the select(nd, in, out, ex, tv) and mmap() system -* calls. Linux for S/390 isn't able to handle more than 5 -* system call parameters, so these system calls used a memory -* block for parameter passing.. +* Perform the mmap() system call. Linux for S/390 isn't able to handle more +* than 5 system call parameters, so this system call uses a memory block +* for parameter passing. */ -struct mmap_arg_struct { +struct s390_mmap_arg_struct {unsigned long addr;unsigned long len;unsigned long prot;
@@ -48,9 +47,9 @@ struct mmap_arg_struct {unsigned long offset; }; -SYSCALL_DEFINE1(mmap2, struct mmap_arg_struct __user *, arg) +SYSCALL_DEFINE1(mmap2, struct s390_mmap_arg_struct __user *, arg) { -struct mmap_arg_struct a; +struct s390_mmap_arg_struct a;int error = -EFAULT ;if (copy_from_user (&a, arg,sizeof (a)))
@@ -60,23 +59,6 @@ out:return error; } -SYSCALL_DEFINE1(s390_old_mmap, struct mmap_arg_struct __user *, arg) -{ -struct mmap_arg_struct a; -long error = -EFAULT ; - -if (copy_from_user (&a, arg,sizeof (a))) - goto out; - - error = -EINVAL ; -if (a.offset & ~PAGE_MASK ) - goto out; - - error =sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, a.fd, a.offset >>PAGE_SHIFT ); -out: -return error; -} -/* * sys_ipc() is the de-multiplexer for the SysV IPC calls.. *
arch/s390/kernel/syscalls.S +1 -1
@@ -98,7 +98,7 @@ SYSCALL(sys_uselib,sys_uselib,sys32_usel SYSCALL(sys_swapon,sys_swapon,sys32_swapon_wrapper) SYSCALL(sys_reboot,sys_reboot,sys32_reboot_wrapper) SYSCALL(sys_ni_syscall,sys_ni_syscall,old32_readdir_wrapper) /* old readdir syscall */ -SYSCALL(sys_s390_old_mmap,sys_s390_old_mmap,old32_mmap_wrapper) /* 90 */ +SYSCALL(sys_old_mmap,sys_old_mmap,old32_mmap_wrapper) /* 90 */ SYSCALL(sys_munmap,sys_munmap,sys32_munmap_wrapper) SYSCALL(sys_truncate,sys_truncate,sys32_truncate_wrapper) SYSCALL(sys_ftruncate,sys_ftruncate,sys32_ftruncate_wrapper)
arch/s390/kernel/entry.h +2 -3
@@ -25,12 +25,11 @@ void __init startup_init(void);void die (const char * str,struct pt_regs * regs,long err);struct new_utsname ; -struct mmap_arg_struct ; +struct s390_mmap_arg_struct ;struct fadvise64_64_args ;struct old_sigaction ; -long sys_mmap2 (struct mmap_arg_struct __user *arg); -long sys_s390_old_mmap (struct mmap_arg_struct __user *arg); +long sys_mmap2 (struct s390_mmap_arg_struct __user *arg);long sys_ipc (uint call,int first,unsigned long second,unsigned long third,void __user *ptr);long sys_s390_newuname (struct new_utsname __user *name);
arch/s390/include/asm/unistd.h +1 -0
@@ -392,6 +392,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_MMAP#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK
arch/x86/include/asm/syscalls.h +0 -2
@@ -51,11 +51,9 @@ asmlinkage int sys_sigaction(int, constunsigned long sys_sigreturn (struct pt_regs *);/* kernel/sys_i386_32.c */ -struct mmap_arg_struct ;struct oldold_utsname ;struct old_utsname ; -asmlinkage int old_mmap(struct mmap_arg_struct __user *); asmlinkage int sys_ipc(uint, int, int, int, void __user *, long); asmlinkage int sys_uname(struct old_utsname __user *); asmlinkage int sys_olduname(struct oldold_utsname __user *);
arch/x86/kernel/sys_i386_32.c +0 -34
@@ -25,40 +25,6 @@#include <asm/syscalls.h> /* -* Perform the select(nd, in, out, ex, tv) and mmap() system -* calls. Linux/i386 didn't use to be able to handle more than -* 4 system call parameters, so these system calls used a memory -* block for parameter passing.. -*/ - -struct mmap_arg_struct { -unsigned long addr; -unsigned long len; -unsigned long prot; -unsigned long flags; -unsigned long fd; -unsigned long offset; -}; - -asmlinkage int old_mmap(struct mmap_arg_struct __user *arg) -{ -struct mmap_arg_struct a; -int err = -EFAULT ; - -if (copy_from_user (&a, arg,sizeof (a))) - goto out; - - err = -EINVAL ; -if (a.offset & ~PAGE_MASK ) - goto out; - - err =sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, - a.fd, a.offset >>PAGE_SHIFT ); -out: -return err; -} - -/* * sys_ipc() is the de-multiplexer for the SysV IPC calls.. * * This is really horribly ugly.
arch/x86/kernel/syscall_table_32.S +1 -1
@@ -89,7 +89,7 @@ ENTRY(sys_call_table) .long sys_swapon .long sys_reboot .long sys_old_readdir - .long old_mmap /* 90 */ + .long sys_old_mmap /* 90 */ .long sys_munmap .long sys_truncate .long sys_ftruncate
arch/ia64/ia32/sys_ia32.c +3 -3
@@ -883,7 +883,7 @@ ia32_do_mmap (struct file *file, unsigne* system calls used a memory block for parameter passing.. */ -struct mmap_arg_struct { +struct mmap_arg_struct32 {unsigned int addr;unsigned int len;unsigned int prot;
@@ -893,9 +893,9 @@ struct mmap_arg_struct { };asmlinkage long -sys32_mmap (struct mmap_arg_struct __user *arg) +sys32_mmap (struct mmap_arg_struct32 __user *arg) { -struct mmap_arg_struct a; +struct mmap_arg_struct32 a;struct file *file =NULL ;unsigned long addr;int flags;
arch/um/sys-i386/shared/sysdep/syscalls.h +0 -2
@@ -13,8 +13,6 @@ typedef long syscall_handler_t(struct pt*/ extern syscall_handler_t sys_rt_sigaction; -extern syscall_handler_t old_mmap_i386; -extern syscall_handler_t *sys_call_table[];#define EXECUTE_SYSCALL (syscall, regs) \
arch/um/sys-i386/sys_call_table.S +1 -1
@@ -7,7 +7,7 @@ #define sys_vm86old sys_ni_syscall #define sys_vm86 sys_ni_syscall -#define old_mmap old_mmap_i386 +#define old_mmap sys_old_mmap #define ptregs_fork sys_fork #define ptregs_execve sys_execve
arch/um/sys-i386/syscalls.c +0 -33
@@ -12,39 +12,6 @@#include "asm/unistd.h" /* -* Perform the select(nd, in, out, ex, tv) and mmap() system -* calls. Linux/i386 didn't use to be able to handle more than -* 4 system call parameters, so these system calls used a memory -* block for parameter passing.. -*/ - -struct mmap_arg_struct { -unsigned long addr; -unsigned long len; -unsigned long prot; -unsigned long flags; -unsigned long fd; -unsigned long offset; -}; - -extern int old_mmap (unsigned long addr,unsigned long len, -unsigned long prot,unsigned long flags, -unsigned long fd,unsigned long offset); - -long old_mmap_i386 (struct mmap_arg_struct __user *arg) -{ -struct mmap_arg_struct a; -int err = -EFAULT ; - -if (copy_from_user (&a, arg,sizeof (a))) - goto out; - - err =old_mmap (a.addr, a.len, a.prot, a.flags, a.fd, a.offset); - out: -return err; -} - -/* * The prototype on i386 is: * * int clone(int flags, void * child_stack, int * parent_tidptr, struct user_desc * newtls, int * child_tidptr)
arch/x86/ia32/sys_ia32.c +3 -3
@@ -143,7 +143,7 @@ asmlinkage long sys32_fstatat(unsigned i* block for parameter passing.. */ -struct mmap_arg_struct { +struct mmap_arg_struct32 {unsigned int addr;unsigned int len;unsigned int prot;
@@ -152,9 +152,9 @@ struct mmap_arg_struct {unsigned int offset; }; -asmlinkage long sys32_mmap (struct mmap_arg_struct __user *arg) +asmlinkage long sys32_mmap (struct mmap_arg_struct32 __user *arg) { -struct mmap_arg_struct a; +struct mmap_arg_struct32 a;if (copy_from_user (&a, arg,sizeof (a)))return -EFAULT ;
arch/x86/include/asm/sys_ia32.h +2 -2
@@ -26,8 +26,8 @@ asmlinkage long sys32_lstat64(char __useasmlinkage long sys32_fstat64 (unsigned int ,struct stat64 __user *);asmlinkage long sys32_fstatat (unsigned int ,char __user *,struct stat64 __user *,int ); -struct mmap_arg_struct ; -asmlinkage long sys32_mmap (struct mmap_arg_struct __user *); +struct mmap_arg_struct32 ; +asmlinkage long sys32_mmap (struct mmap_arg_struct32 __user *);asmlinkage long sys32_mprotect (unsigned long ,size_t ,unsigned long );struct sigaction32 ;
arch/x86/include/asm/unistd_32.h +1 -0
@@ -366,6 +366,7 @@#define __ARCH_WANT_SYS_LLSEEK#define __ARCH_WANT_SYS_NICE#define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_MMAP#define __ARCH_WANT_SYS_OLD_SELECT#define __ARCH_WANT_SYS_OLDUMOUNT#define __ARCH_WANT_SYS_SIGPENDING
mm/nommu.c +24 -0
@@ -1428,6 +1428,30 @@ out:return retval; } +#ifdef __ARCH_WANT_SYS_OLD_MMAP +struct mmap_arg_struct { +unsigned long addr; +unsigned long len; +unsigned long prot; +unsigned long flags; +unsigned long fd; +unsigned long offset; +}; + +SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg) +{ +struct mmap_arg_struct a; + +if (copy_from_user (&a, arg,sizeof (a))) +return -EFAULT ; +if (a.offset & ~PAGE_MASK ) +return -EINVAL ; + +return sys_mmap_pgoff (a.addr, a.len, a.prot, a.flags, a.fd, + a.offset >>PAGE_SHIFT ); +} +#endif /* __ARCH_WANT_SYS_OLD_MMAP */ +/* * split a vma into two pieces at address 'addr', a new vma is allocated either * for the first part or the tail.
Quoted 2 lines
Add a generic implementation of the old mmap syscall, which expects it's argument in a memory block and switch all architectures over to use it.
Looks good to me from an x86 perspective.
Quoted 2 lines · Christoph Hellwig
Add a generic implementation of the old mmap syscall, which expects it's argument in a memory block and switch all architectures over to use it.
Looks fine to me.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
Quoted 5 lines · Christoph Hellwig
Add a generic implementation of the old mmap syscall, which expects it's argument in a memory block and switch all architectures over to use it.
Signed-off-by Christoph Hellwig <[email protected]>
m68knommu and mm/nommu.c changes look ok to me
Signature · 5 lines
------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: [email protected] SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
Quoted 2 lines · Christoph Hellwig
Add a generic implementation of the old mmap syscall, which expects it's argument in a memory block and switch all architectures over to use it.
CRIS parts look ok.
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Quoted 5 lines · Christoph Hellwig
Add a generic implementation of the old mmap syscall, which expects it's argument in a memory block and switch all architectures over to use it.
Signed-off-by Christoph Hellwig <[email protected]>