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

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

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

    commit d5460c9974a321a194aded4a8c4daaac68ea8171 upstream.

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    ipc/mqueue.c | 6 +++---
    ipc/sem.c | 9 +++++----
    ipc/shm.c | 8 ++++----
    3 files changed, 12 insertions(+), 11 deletions(-)

    --- a/ipc/mqueue.c
    +++ b/ipc/mqueue.c
    @@ -647,8 +647,8 @@ static int oflag2acc[O_ACCMODE] = { MAY_
    return dentry_open(dentry, mqueue_mnt, oflag);
    }

    -asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
    - struct mq_attr __user *u_attr)
    +SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode,
    + struct mq_attr __user *, u_attr)
    {
    struct dentry *dentry;
    struct file *filp;
    @@ -715,7 +715,7 @@ out_putname:
    return fd;
    }

    -asmlinkage long sys_mq_unlink(const char __user *u_name)
    +SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
    {
    int err;
    char *name;
    --- a/ipc/sem.c
    +++ b/ipc/sem.c
    @@ -308,7 +308,7 @@ static inline int sem_more_checks(struct
    return 0;
    }

    -asmlinkage long sys_semget(key_t key, int nsems, int semflg)
    +SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
    {
    struct ipc_namespace *ns;
    struct ipc_ops sem_ops;
    @@ -1055,8 +1055,8 @@ out:
    return un;
    }

    -asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
    - unsigned nsops, const struct timespec __user *timeout)
    +SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
    + unsigned, nsops, const struct timespec __user *, timeout)
    {
    int error = -EINVAL;
    struct sem_array *sma;
    @@ -1233,7 +1233,8 @@ out_free:
    return error;
    }

    -asmlinkage long sys_semop (int semid, struct sembuf __user *tsops, unsigned nsops)
    +SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
    + unsigned, nsops)
    {
    return sys_semtimedop(semid, tsops, nsops, NULL);
    }
    --- a/ipc/shm.c
    +++ b/ipc/shm.c
    @@ -440,7 +440,7 @@ static inline int shm_more_checks(struct
    return 0;
    }

    -asmlinkage long sys_shmget (key_t key, size_t size, int shmflg)
    +SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
    {
    struct ipc_namespace *ns;
    struct ipc_ops shm_ops;
    @@ -621,7 +621,7 @@ out_up:
    return err;
    }

    -asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
    +SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf)
    {
    struct shmid_kernel *shp;
    int err, version;
    @@ -941,7 +941,7 @@ out_put_dentry:
    goto out_nattch;
    }

    -asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg)
    +SYSCALL_DEFINE3(shmat, int, shmid, char __user *, shmaddr, int, shmflg)
    {
    unsigned long ret;
    long err;
    @@ -957,7 +957,7 @@ asmlinkage long sys_shmat(int shmid, cha
    * detach and kill segment if marked destroyed.
    * The work is done in shm_close.
    */
    -asmlinkage long sys_shmdt(char __user *shmaddr)
    +SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
    {
    struct mm_struct *mm = current->mm;
    struct vm_area_struct *vma, *next;


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