Commit a5f8fa9e9ba5ef3305e147f41ad6e1e84ac1f0bd
1 parent
17da2bd90a
Exists in
master
and in
4 other branches
[CVE-2009-0029] System call wrappers part 09
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Showing 2 changed files with 11 additions and 16 deletions Side-by-side Diff
fs/sync.c
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | laptop_sync_completion(); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -asmlinkage long sys_sync(void) | |
| 39 | +SYSCALL_DEFINE0(sync) | |
| 40 | 40 | { |
| 41 | 41 | do_sync(1); |
| 42 | 42 | return 0; |
| 43 | 43 | |
| ... | ... | @@ -144,12 +144,12 @@ |
| 144 | 144 | return ret; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | -asmlinkage long sys_fsync(unsigned int fd) | |
| 147 | +SYSCALL_DEFINE1(fsync, unsigned int, fd) | |
| 148 | 148 | { |
| 149 | 149 | return do_fsync(fd, 0); |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | -asmlinkage long sys_fdatasync(unsigned int fd) | |
| 152 | +SYSCALL_DEFINE1(fdatasync, unsigned int, fd) | |
| 153 | 153 | { |
| 154 | 154 | return do_fsync(fd, 1); |
| 155 | 155 | } |
kernel/signal.c
| ... | ... | @@ -2279,7 +2279,7 @@ |
| 2279 | 2279 | * exists but it's not belonging to the target process anymore. This |
| 2280 | 2280 | * method solves the problem of threads exiting and PIDs getting reused. |
| 2281 | 2281 | */ |
| 2282 | -asmlinkage long sys_tgkill(pid_t tgid, pid_t pid, int sig) | |
| 2282 | +SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid_t, pid, int, sig) | |
| 2283 | 2283 | { |
| 2284 | 2284 | /* This is only valid for single tasks */ |
| 2285 | 2285 | if (pid <= 0 || tgid <= 0) |
| ... | ... | @@ -2291,8 +2291,7 @@ |
| 2291 | 2291 | /* |
| 2292 | 2292 | * Send a signal to only one task, even if it's a CLONE_THREAD task. |
| 2293 | 2293 | */ |
| 2294 | -asmlinkage long | |
| 2295 | -sys_tkill(pid_t pid, int sig) | |
| 2294 | +SYSCALL_DEFINE2(tkill, pid_t, pid, int, sig) | |
| 2296 | 2295 | { |
| 2297 | 2296 | /* This is only valid for single tasks */ |
| 2298 | 2297 | if (pid <= 0) |
| ... | ... | @@ -2301,8 +2300,8 @@ |
| 2301 | 2300 | return do_tkill(0, pid, sig); |
| 2302 | 2301 | } |
| 2303 | 2302 | |
| 2304 | -asmlinkage long | |
| 2305 | -sys_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t __user *uinfo) | |
| 2303 | +SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, pid, int, sig, | |
| 2304 | + siginfo_t __user *, uinfo) | |
| 2306 | 2305 | { |
| 2307 | 2306 | siginfo_t info; |
| 2308 | 2307 | |
| 2309 | 2308 | |
| ... | ... | @@ -2526,15 +2525,13 @@ |
| 2526 | 2525 | /* |
| 2527 | 2526 | * For backwards compatibility. Functionality superseded by sigprocmask. |
| 2528 | 2527 | */ |
| 2529 | -asmlinkage long | |
| 2530 | -sys_sgetmask(void) | |
| 2528 | +SYSCALL_DEFINE0(sgetmask) | |
| 2531 | 2529 | { |
| 2532 | 2530 | /* SMP safe */ |
| 2533 | 2531 | return current->blocked.sig[0]; |
| 2534 | 2532 | } |
| 2535 | 2533 | |
| 2536 | -asmlinkage long | |
| 2537 | -sys_ssetmask(int newmask) | |
| 2534 | +SYSCALL_DEFINE1(ssetmask, int, newmask) | |
| 2538 | 2535 | { |
| 2539 | 2536 | int old; |
| 2540 | 2537 | |
| ... | ... | @@ -2554,8 +2551,7 @@ |
| 2554 | 2551 | /* |
| 2555 | 2552 | * For backwards compatibility. Functionality superseded by sigaction. |
| 2556 | 2553 | */ |
| 2557 | -asmlinkage long | |
| 2558 | -sys_signal(int sig, __sighandler_t handler) | |
| 2554 | +SYSCALL_DEFINE2(signal, int, sig, __sighandler_t, handler) | |
| 2559 | 2555 | { |
| 2560 | 2556 | struct k_sigaction new_sa, old_sa; |
| 2561 | 2557 | int ret; |
| ... | ... | @@ -2572,8 +2568,7 @@ |
| 2572 | 2568 | |
| 2573 | 2569 | #ifdef __ARCH_WANT_SYS_PAUSE |
| 2574 | 2570 | |
| 2575 | -asmlinkage long | |
| 2576 | -sys_pause(void) | |
| 2571 | +SYSCALL_DEFINE0(pause) | |
| 2577 | 2572 | { |
| 2578 | 2573 | current->state = TASK_INTERRUPTIBLE; |
| 2579 | 2574 | schedule(); |