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 69/94] [PATCH 38/44] [CVE-2009-0029] System call wrappers part 28
    2.6.28-stable review patch.  If anyone has any objections, please let us know.

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

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

    commit 938bb9f5e840eddbf54e4f62f6c5ba9b3ae12c9d upstream.

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/inotify_user.c | 4 ++--
    fs/ioprio.c | 5 ++---
    mm/mempolicy.c | 24 +++++++++++-------------
    mm/migrate.c | 8 ++++----
    security/keys/keyctl.c | 4 ++--
    5 files changed, 21 insertions(+), 24 deletions(-)

    --- a/fs/inotify_user.c
    +++ b/fs/inotify_user.c
    @@ -576,7 +576,7 @@ static const struct inotify_operations i
    .destroy_watch = free_inotify_user_watch,
    };

    -asmlinkage long sys_inotify_init1(int flags)
    +SYSCALL_DEFINE1(inotify_init1, int, flags)
    {
    struct inotify_device *dev;
    struct inotify_handle *ih;
    @@ -655,7 +655,7 @@ out_put_fd:
    return ret;
    }

    -asmlinkage long sys_inotify_init(void)
    +SYSCALL_DEFINE0(inotify_init)
    {
    return sys_inotify_init1(0);
    }
    --- a/fs/ioprio.c
    +++ b/fs/ioprio.c
    @@ -65,7 +65,7 @@ static int set_task_ioprio(struct task_s
    return err;
    }

    -asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
    +SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio)
    {
    int class = IOPRIO_PRIO_CLASS(ioprio);
    int data = IOPRIO_PRIO_DATA(ioprio);
    @@ -181,7 +181,7 @@ int ioprio_best(unsigned short aprio, un
    return aprio;
    }

    -asmlinkage long sys_ioprio_get(int which, int who)
    +SYSCALL_DEFINE2(ioprio_get, int, which, int, who)
    {
    struct task_struct *g, *p;
    struct user_struct *user;
    @@ -245,4 +245,3 @@ asmlinkage long sys_ioprio_get(int which
    read_unlock(&tasklist_lock);
    return ret;
    }
    -
    --- a/mm/mempolicy.c
    +++ b/mm/mempolicy.c
    @@ -1068,10 +1068,9 @@ static int copy_nodes_to_user(unsigned l
    return copy_to_user(mask, nodes_addr(*nodes), copy) ? -EFAULT : 0;
    }

    -asmlinkage long sys_mbind(unsigned long start, unsigned long len,
    - unsigned long mode,
    - unsigned long __user *nmask, unsigned long maxnode,
    - unsigned flags)
    +SYSCALL_DEFINE6(mbind, unsigned long, start, unsigned long, len,
    + unsigned long, mode, unsigned long __user *, nmask,
    + unsigned long, maxnode, unsigned, flags)
    {
    nodemask_t nodes;
    int err;
    @@ -1091,8 +1090,8 @@ asmlinkage long sys_mbind(unsigned long
    }

    /* Set the process memory policy */
    -asmlinkage long sys_set_mempolicy(int mode, unsigned long __user *nmask,
    - unsigned long maxnode)
    +SYSCALL_DEFINE3(set_mempolicy, int, mode, unsigned long __user *, nmask,
    + unsigned long, maxnode)
    {
    int err;
    nodemask_t nodes;
    @@ -1110,9 +1109,9 @@ asmlinkage long sys_set_mempolicy(int mo
    return do_set_mempolicy(mode, flags, &nodes);
    }

    -asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
    - const unsigned long __user *old_nodes,
    - const unsigned long __user *new_nodes)
    +SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
    + const unsigned long __user *, old_nodes,
    + const unsigned long __user *, new_nodes)
    {
    struct mm_struct *mm;
    struct task_struct *task;
    @@ -1180,10 +1179,9 @@ out:


    /* Retrieve NUMA policy */
    -asmlinkage long sys_get_mempolicy(int __user *policy,
    - unsigned long __user *nmask,
    - unsigned long maxnode,
    - unsigned long addr, unsigned long flags)
    +SYSCALL_DEFINE5(get_mempolicy, int __user *, policy,
    + unsigned long __user *, nmask, unsigned long, maxnode,
    + unsigned long, addr, unsigned long, flags)
    {
    int err;
    int uninitialized_var(pval);
    --- a/mm/migrate.c
    +++ b/mm/migrate.c
    @@ -1070,10 +1070,10 @@ out:
    * Move a list of pages in the address space of the currently executing
    * process.
    */
    -asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
    - const void __user * __user *pages,
    - const int __user *nodes,
    - int __user *status, int flags)
    +SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
    + const void __user * __user *, pages,
    + const int __user *, nodes,
    + int __user *, status, int, flags)
    {
    struct task_struct *task;
    struct mm_struct *mm;
    --- a/security/keys/keyctl.c
    +++ b/security/keys/keyctl.c
    @@ -1152,8 +1152,8 @@ long keyctl_get_security(key_serial_t ke
    /*
    * the key control system call
    */
    -asmlinkage long sys_keyctl(int option, unsigned long arg2, unsigned long arg3,
    - unsigned long arg4, unsigned long arg5)
    +SYSCALL_DEFINE5(keyctl, int, option, unsigned long, arg2, unsigned long, arg3,
    + unsigned long, arg4, unsigned long, arg5)
    {
    switch (option) {
    case KEYCTL_GET_KEYRING_ID:


    \
     
     \ /
      Last update: 2009-01-15 21:47    [W:0.027 / U:0.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site