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

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

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

    commit 5a8a82b1d306a325d899b67715618413657efda4 upstream.

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/eventpoll.c | 18 +++++++++---------
    fs/select.c | 8 ++++----
    kernel/sys.c | 6 +++---
    3 files changed, 16 insertions(+), 16 deletions(-)

    --- a/fs/eventpoll.c
    +++ b/fs/eventpoll.c
    @@ -1106,7 +1106,7 @@ retry:
    /*
    * Open an eventpoll file descriptor.
    */
    -asmlinkage long sys_epoll_create1(int flags)
    +SYSCALL_DEFINE1(epoll_create1, int, flags)
    {
    int error, fd = -1;
    struct eventpoll *ep;
    @@ -1146,7 +1146,7 @@ error_return:
    return fd;
    }

    -asmlinkage long sys_epoll_create(int size)
    +SYSCALL_DEFINE1(epoll_create, int, size)
    {
    if (size < 0)
    return -EINVAL;
    @@ -1159,8 +1159,8 @@ asmlinkage long sys_epoll_create(int siz
    * the eventpoll file that enables the insertion/removal/change of
    * file descriptors inside the interest set.
    */
    -asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
    - struct epoll_event __user *event)
    +SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
    + struct epoll_event __user *, event)
    {
    int error;
    struct file *file, *tfile;
    @@ -1257,8 +1257,8 @@ error_return:
    * Implement the event wait interface for the eventpoll file. It is the kernel
    * part of the user space epoll_wait(2).
    */
    -asmlinkage long sys_epoll_wait(int epfd, struct epoll_event __user *events,
    - int maxevents, int timeout)
    +SYSCALL_DEFINE4(epoll_wait, int, epfd, struct epoll_event __user *, events,
    + int, maxevents, int, timeout)
    {
    int error;
    struct file *file;
    @@ -1315,9 +1315,9 @@ error_return:
    * Implement the event wait interface for the eventpoll file. It is the kernel
    * part of the user space epoll_pwait(2).
    */
    -asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
    - int maxevents, int timeout, const sigset_t __user *sigmask,
    - size_t sigsetsize)
    +SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events,
    + int, maxevents, int, timeout, const sigset_t __user *, sigmask,
    + size_t, sigsetsize)
    {
    int error;
    sigset_t ksigmask, sigsaved;
    --- a/fs/select.c
    +++ b/fs/select.c
    @@ -374,8 +374,8 @@ out_nofds:
    return ret;
    }

    -asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp,
    - fd_set __user *exp, struct timeval __user *tvp)
    +SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
    + fd_set __user *, exp, struct timeval __user *, tvp)
    {
    s64 timeout = -1;
    struct timeval tv;
    @@ -727,8 +727,8 @@ static long do_restart_poll(struct resta
    return ret;
    }

    -asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
    - long timeout_msecs)
    +SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
    + long, timeout_msecs)
    {
    s64 timeout_jiffies;
    int ret;
    --- a/kernel/sys.c
    +++ b/kernel/sys.c
    @@ -1340,7 +1340,7 @@ asmlinkage long sys_newuname(struct new_
    return errno;
    }

    -asmlinkage long sys_sethostname(char __user *name, int len)
    +SYSCALL_DEFINE2(sethostname, char __user *, name, int, len)
    {
    int errno;
    char tmp[__NEW_UTS_LEN];
    @@ -1362,7 +1362,7 @@ asmlinkage long sys_sethostname(char __u

    #ifdef __ARCH_WANT_SYS_GETHOSTNAME

    -asmlinkage long sys_gethostname(char __user *name, int len)
    +SYSCALL_DEFINE2(gethostname, char __user *, name, int, len)
    {
    int i, errno;

    @@ -1385,7 +1385,7 @@ asmlinkage long sys_gethostname(char __u
    * Only setdomainname; getdomainname can be implemented by calling
    * uname()
    */
    -asmlinkage long sys_setdomainname(char __user *name, int len)
    +SYSCALL_DEFINE2(setdomainname, char __user *, name, int, len)
    {
    int errno;
    char tmp[__NEW_UTS_LEN];


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