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 59/85] [PATCH 39/44] [CVE-2009-0029] System call wrappers part 29
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

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

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

    commit 2e4d0924eb0c403ce4014fa139d1d61bf2c44fee upstream.

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/inotify_user.c | 5 +++--
    fs/namei.c | 21 ++++++++++-----------
    2 files changed, 13 insertions(+), 13 deletions(-)

    --- a/fs/inotify_user.c
    +++ b/fs/inotify_user.c
    @@ -663,7 +663,8 @@ SYSCALL_DEFINE0(inotify_init)
    return sys_inotify_init1(0);
    }

    -asmlinkage long sys_inotify_add_watch(int fd, const char __user *pathname, u32 mask)
    +SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,
    + u32, mask)
    {
    struct inode *inode;
    struct inotify_device *dev;
    @@ -707,7 +708,7 @@ fput_and_out:
    return ret;
    }

    -asmlinkage long sys_inotify_rm_watch(int fd, __s32 wd)
    +SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
    {
    struct file *filp;
    struct inotify_device *dev;
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -1990,8 +1990,8 @@ static int may_mknod(mode_t mode)
    }
    }

    -asmlinkage long sys_mknodat(int dfd, const char __user *filename, int mode,
    - unsigned dev)
    +SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
    + unsigned, dev)
    {
    int error;
    char *tmp;
    @@ -2068,7 +2068,7 @@ int vfs_mkdir(struct inode *dir, struct
    return error;
    }

    -asmlinkage long sys_mkdirat(int dfd, const char __user *pathname, int mode)
    +SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
    {
    int error = 0;
    char * tmp;
    @@ -2297,7 +2297,7 @@ slashes:
    goto exit2;
    }

    -asmlinkage long sys_unlinkat(int dfd, const char __user *pathname, int flag)
    +SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)
    {
    if ((flag & ~AT_REMOVEDIR) != 0)
    return -EINVAL;
    @@ -2334,8 +2334,8 @@ int vfs_symlink(struct inode *dir, struc
    return error;
    }

    -asmlinkage long sys_symlinkat(const char __user *oldname,
    - int newdfd, const char __user *newname)
    +SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
    + int, newdfd, const char __user *, newname)
    {
    int error;
    char *from;
    @@ -2424,9 +2424,8 @@ int vfs_link(struct dentry *old_dentry,
    * with linux 2.0, and to avoid hard-linking to directories
    * and other special files. --ADM
    */
    -asmlinkage long sys_linkat(int olddfd, const char __user *oldname,
    - int newdfd, const char __user *newname,
    - int flags)
    +SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
    + int, newdfd, const char __user *, newname, int, flags)
    {
    struct dentry *new_dentry;
    struct nameidata nd;
    @@ -2622,8 +2621,8 @@ int vfs_rename(struct inode *old_dir, st
    return error;
    }

    -asmlinkage long sys_renameat(int olddfd, const char __user *oldname,
    - int newdfd, const char __user *newname)
    +SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
    + int, newdfd, const char __user *, newname)
    {
    struct dentry *old_dir, *new_dir;
    struct dentry *old_dentry, *new_dentry;


    \
     
     \ /
      Last update: 2009-01-15 23:37    [W:4.388 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site