lkml.org 
[lkml]   [2009]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 45/85] [PATCH 25/44] [CVE-2009-0029] System call wrappers part 15
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Heiko Carstens <heiko.carstens@de.ibm.com>

    commit a26eab2400f0477bfac0255600552394855016f7 upstream.

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/fcntl.c | 11 ++++++-----
    fs/ioctl.c | 2 +-
    fs/namei.c | 2 +-
    fs/open.c | 4 ++--
    4 files changed, 10 insertions(+), 9 deletions(-)

    --- a/fs/fcntl.c
    +++ b/fs/fcntl.c
    @@ -50,7 +50,7 @@ static int get_close_on_exec(unsigned in
    return res;
    }

    -asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags)
    +SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
    {
    int err = -EBADF;
    struct file * file, *tofree;
    @@ -113,7 +113,7 @@ out_unlock:
    return err;
    }

    -asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)
    +SYSCALL_DEFINE2(dup2, unsigned int, oldfd, unsigned int, newfd)
    {
    if (unlikely(newfd == oldfd)) { /* corner case */
    struct files_struct *files = current->files;
    @@ -126,7 +126,7 @@ asmlinkage long sys_dup2(unsigned int ol
    return sys_dup3(oldfd, newfd, 0);
    }

    -asmlinkage long sys_dup(unsigned int fildes)
    +SYSCALL_DEFINE1(dup, unsigned int, fildes)
    {
    int ret = -EBADF;
    struct file *file = fget(fildes);
    @@ -334,7 +334,7 @@ static long do_fcntl(int fd, unsigned in
    return err;
    }

    -asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg)
    +SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)
    {
    struct file *filp;
    long err = -EBADF;
    @@ -357,7 +357,8 @@ out:
    }

    #if BITS_PER_LONG == 32
    -asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
    +SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,
    + unsigned long, arg)
    {
    struct file * filp;
    long err;
    --- a/fs/ioctl.c
    +++ b/fs/ioctl.c
    @@ -195,7 +195,7 @@ int do_vfs_ioctl(struct file *filp, unsi
    return error;
    }

    -asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
    +SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)
    {
    struct file *filp;
    int error = -EBADF;
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2707,7 +2707,7 @@ exit:
    return error;
    }

    -asmlinkage long sys_rename(const char __user *oldname, const char __user *newname)
    +SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newname)
    {
    return sys_renameat(AT_FDCWD, oldname, AT_FDCWD, newname);
    }
    --- a/fs/open.c
    +++ b/fs/open.c
    @@ -599,7 +599,7 @@ out:
    return error;
    }

    -asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
    +SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode)
    {
    struct inode * inode;
    struct dentry * dentry;
    @@ -663,7 +663,7 @@ out:
    return error;
    }

    -asmlinkage long sys_chmod(const char __user *filename, mode_t mode)
    +SYSCALL_DEFINE2(chmod, const char __user *, filename, mode_t, mode)
    {
    return sys_fchmodat(AT_FDCWD, filename, mode);
    }


    \
     
     \ /
      Last update: 2009-01-15 23:29    [W:0.023 / U:126.840 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site