| From dbf040d9d1cbf1ef6250bdb095c5c118950bcde8 Mon Sep 17 00:00:00 2001 |
| From: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Date: Wed, 14 Jan 2009 14:14:04 +0100 |
| Subject: [PATCH 12/44] [CVE-2009-0029] System call wrappers part 02 |
| |
| From: Heiko Carstens <heiko.carstens@de.ibm.com> |
| |
| commit dbf040d9d1cbf1ef6250bdb095c5c118950bcde8 upstream. |
| |
| Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| kernel/sys.c | 10 +++++----- |
| kernel/timer.c | 10 +++++----- |
| 2 files changed, 10 insertions(+), 10 deletions(-) |
| |
| --- a/kernel/sys.c |
| +++ b/kernel/sys.c |
| @@ -733,7 +733,7 @@ asmlinkage long sys_setresuid(uid_t ruid |
| return security_task_post_setuid(old_ruid, old_euid, old_suid, LSM_SETID_RES); |
| } |
| |
| -asmlinkage long sys_getresuid(uid_t __user *ruid, uid_t __user *euid, uid_t __user *suid) |
| +SYSCALL_DEFINE3(getresuid, uid_t __user *, ruid, uid_t __user *, euid, uid_t __user *, suid) |
| { |
| int retval; |
| |
| @@ -784,7 +784,7 @@ asmlinkage long sys_setresgid(gid_t rgid |
| return 0; |
| } |
| |
| -asmlinkage long sys_getresgid(gid_t __user *rgid, gid_t __user *egid, gid_t __user *sgid) |
| +SYSCALL_DEFINE3(getresgid, gid_t __user *, rgid, gid_t __user *, egid, gid_t __user *, sgid) |
| { |
| int retval; |
| |
| @@ -964,7 +964,7 @@ out: |
| return err; |
| } |
| |
| -asmlinkage long sys_getpgid(pid_t pid) |
| +SYSCALL_DEFINE1(getpgid, pid_t, pid) |
| { |
| struct task_struct *p; |
| struct pid *grp; |
| @@ -994,14 +994,14 @@ out: |
| |
| #ifdef __ARCH_WANT_SYS_GETPGRP |
| |
| -asmlinkage long sys_getpgrp(void) |
| +SYSCALL_DEFINE0(getpgrp) |
| { |
| return sys_getpgid(0); |
| } |
| |
| #endif |
| |
| -asmlinkage long sys_getsid(pid_t pid) |
| +SYSCALL_DEFINE1(getsid, pid_t, pid) |
| { |
| struct task_struct *p; |
| struct pid *sid; |
| --- a/kernel/timer.c |
| +++ b/kernel/timer.c |
| @@ -1178,7 +1178,7 @@ SYSCALL_DEFINE0(getpid) |
| * value of ->real_parent under rcu_read_lock(), see |
| * release_task()->call_rcu(delayed_put_task_struct). |
| */ |
| -asmlinkage long sys_getppid(void) |
| +SYSCALL_DEFINE0(getppid) |
| { |
| int pid; |
| |
| @@ -1189,25 +1189,25 @@ asmlinkage long sys_getppid(void) |
| return pid; |
| } |
| |
| -asmlinkage long sys_getuid(void) |
| +SYSCALL_DEFINE0(getuid) |
| { |
| /* Only we change this so SMP safe */ |
| return current->uid; |
| } |
| |
| -asmlinkage long sys_geteuid(void) |
| +SYSCALL_DEFINE0(geteuid) |
| { |
| /* Only we change this so SMP safe */ |
| return current->euid; |
| } |
| |
| -asmlinkage long sys_getgid(void) |
| +SYSCALL_DEFINE0(getgid) |
| { |
| /* Only we change this so SMP safe */ |
| return current->gid; |
| } |
| |
| -asmlinkage long sys_getegid(void) |
| +SYSCALL_DEFINE0(getegid) |
| { |
| /* Only we change this so SMP safe */ |
| return current->egid; |