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

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

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

    commit 754fe8d297bfae7b77f7ce866e2fb0c5fb186506 upstream.

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    kernel/exit.c | 8 ++++----
    kernel/kexec.c | 5 ++---
    kernel/sched.c | 4 ++--
    kernel/signal.c | 2 +-
    kernel/sys.c | 7 ++++---
    net/socket.c | 2 +-
    6 files changed, 14 insertions(+), 14 deletions(-)

    --- a/kernel/exit.c
    +++ b/kernel/exit.c
    @@ -1145,7 +1145,7 @@ NORET_TYPE void complete_and_exit(struct

    EXPORT_SYMBOL(complete_and_exit);

    -asmlinkage long sys_exit(int error_code)
    +SYSCALL_DEFINE1(exit, int, error_code)
    {
    do_exit((error_code&0xff)<<8);
    }
    @@ -1186,7 +1186,7 @@ do_group_exit(int exit_code)
    * wait4()-ing process will get the correct exit code - even if this
    * thread is not the thread group leader.
    */
    -asmlinkage long sys_exit_group(int error_code)
    +SYSCALL_DEFINE1(exit_group, int, error_code)
    {
    do_group_exit((error_code & 0xff) << 8);
    /* NOTREACHED */
    @@ -1792,8 +1792,8 @@ asmlinkage long sys_waitid(int which, pi
    return ret;
    }

    -asmlinkage long sys_wait4(pid_t upid, int __user *stat_addr,
    - int options, struct rusage __user *ru)
    +SYSCALL_DEFINE4(wait4, pid_t, upid, int __user *, stat_addr,
    + int, options, struct rusage __user *, ru)
    {
    struct pid *pid = NULL;
    enum pid_type type;
    --- a/kernel/kexec.c
    +++ b/kernel/kexec.c
    @@ -933,9 +933,8 @@ struct kimage *kexec_crash_image;

    static DEFINE_MUTEX(kexec_mutex);

    -asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments,
    - struct kexec_segment __user *segments,
    - unsigned long flags)
    +SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
    + struct kexec_segment __user *, segments, unsigned long, flags)
    {
    struct kimage **dest_image, *image;
    int result;
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -5651,8 +5651,8 @@ SYSCALL_DEFINE1(sched_get_priority_min,
    * this syscall writes the default timeslice value of a given process
    * into the user-space timespec buffer. A value of '0' means infinity.
    */
    -asmlinkage
    -long sys_sched_rr_get_interval(pid_t pid, struct timespec __user *interval)
    +SYSCALL_DEFINE4(sched_rr_get_interval, pid_t, pid,
    + struct timespec __user *, interval)
    {
    struct task_struct *p;
    unsigned int time_slice;
    --- a/kernel/signal.c
    +++ b/kernel/signal.c
    @@ -1936,7 +1936,7 @@ EXPORT_SYMBOL(unblock_all_signals);
    * System call entry points.
    */

    -asmlinkage long sys_restart_syscall(void)
    +SYSCALL_DEFINE0(restart_syscall)
    {
    struct restart_block *restart = &current_thread_info()->restart_block;
    return restart->fn(restart);
    --- a/kernel/sys.c
    +++ b/kernel/sys.c
    @@ -137,7 +137,7 @@ out:
    return error;
    }

    -asmlinkage long sys_setpriority(int which, int who, int niceval)
    +SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval)
    {
    struct task_struct *g, *p;
    struct user_struct *user;
    @@ -201,7 +201,7 @@ out:
    * has been offset by 20 (ie it returns 40..1 instead of -20..19)
    * to stay compatible.
    */
    -asmlinkage long sys_getpriority(int which, int who)
    +SYSCALL_DEFINE2(getpriority, int, which, int, who)
    {
    struct task_struct *g, *p;
    struct user_struct *user;
    @@ -347,7 +347,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
    *
    * reboot doesn't sync: do that yourself before calling this.
    */
    -asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user * arg)
    +SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
    + void __user *, arg)
    {
    char buffer[256];

    --- a/net/socket.c
    +++ b/net/socket.c
    @@ -1854,7 +1854,7 @@ out_put:
    * Shutdown a socket.
    */

    -asmlinkage long sys_shutdown(int fd, int how)
    +SYSCALL_DEFINE2(shutdown, int, fd, int, how)
    {
    int err, fput_needed;
    struct socket *sock;


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