Commit 003d7ab479168132a2b2c6700fe682b08f08ab0c
1 parent
a6b42e83f2
Exists in
master
and in
20 other branches
[CVE-2009-0029] System call wrappers part 19
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Showing 3 changed files with 13 additions and 12 deletions Side-by-side Diff
fs/read_write.c
| ... | ... | @@ -147,7 +147,7 @@ |
| 147 | 147 | } |
| 148 | 148 | EXPORT_SYMBOL(vfs_llseek); |
| 149 | 149 | |
| 150 | -asmlinkage long sys_lseek(unsigned int fd, off_t offset, unsigned int origin) | |
| 150 | +SYSCALL_DEFINE3(lseek, unsigned int, fd, off_t, offset, unsigned int, origin) | |
| 151 | 151 | { |
| 152 | 152 | off_t retval; |
| 153 | 153 | struct file * file; |
| ... | ... | @@ -171,9 +171,9 @@ |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | #ifdef __ARCH_WANT_SYS_LLSEEK |
| 174 | -asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high, | |
| 175 | - unsigned long offset_low, loff_t __user * result, | |
| 176 | - unsigned int origin) | |
| 174 | +SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high, | |
| 175 | + unsigned long, offset_low, loff_t __user *, result, | |
| 176 | + unsigned int, origin) | |
| 177 | 177 | { |
| 178 | 178 | int retval; |
| 179 | 179 | struct file * file; |
fs/utimes.c
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | * must be owner or have write permission. |
| 25 | 25 | * Else, update from *times, must be owner or super user. |
| 26 | 26 | */ |
| 27 | -asmlinkage long sys_utime(char __user *filename, struct utimbuf __user *times) | |
| 27 | +SYSCALL_DEFINE2(utime, char __user *, filename, struct utimbuf __user *, times) | |
| 28 | 28 | { |
| 29 | 29 | struct timespec tv[2]; |
| 30 | 30 | |
| ... | ... | @@ -214,7 +214,8 @@ |
| 214 | 214 | return do_utimes(dfd, filename, utimes ? tstimes : NULL, 0); |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | -asmlinkage long sys_utimes(char __user *filename, struct timeval __user *utimes) | |
| 217 | +SYSCALL_DEFINE2(utimes, char __user *, filename, | |
| 218 | + struct timeval __user *, utimes) | |
| 218 | 219 | { |
| 219 | 220 | return sys_futimesat(AT_FDCWD, filename, utimes); |
| 220 | 221 | } |
kernel/uid16.c
| ... | ... | @@ -162,7 +162,7 @@ |
| 162 | 162 | return 0; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | -asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist) | |
| 165 | +SYSCALL_DEFINE2(getgroups16, int, gidsetsize, old_gid_t __user *, grouplist) | |
| 166 | 166 | { |
| 167 | 167 | const struct cred *cred = current_cred(); |
| 168 | 168 | int i; |
| ... | ... | @@ -185,7 +185,7 @@ |
| 185 | 185 | return i; |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | -asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *grouplist) | |
| 188 | +SYSCALL_DEFINE2(setgroups16, int, gidsetsize, old_gid_t __user *, grouplist) | |
| 189 | 189 | { |
| 190 | 190 | struct group_info *group_info; |
| 191 | 191 | int retval; |
| 192 | 192 | |
| 193 | 193 | |
| 194 | 194 | |
| ... | ... | @@ -210,22 +210,22 @@ |
| 210 | 210 | return retval; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | -asmlinkage long sys_getuid16(void) | |
| 213 | +SYSCALL_DEFINE0(getuid16) | |
| 214 | 214 | { |
| 215 | 215 | return high2lowuid(current_uid()); |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | -asmlinkage long sys_geteuid16(void) | |
| 218 | +SYSCALL_DEFINE0(geteuid16) | |
| 219 | 219 | { |
| 220 | 220 | return high2lowuid(current_euid()); |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | -asmlinkage long sys_getgid16(void) | |
| 223 | +SYSCALL_DEFINE0(getgid16) | |
| 224 | 224 | { |
| 225 | 225 | return high2lowgid(current_gid()); |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | -asmlinkage long sys_getegid16(void) | |
| 228 | +SYSCALL_DEFINE0(getegid16) | |
| 229 | 229 | { |
| 230 | 230 | return high2lowgid(current_egid()); |
| 231 | 231 | } |