Commit 2e4d0924eb0c403ce4014fa139d1d61bf2c44fee
1 parent
938bb9f5e8
Exists in
master
and in
20 other branches
[CVE-2009-0029] System call wrappers part 29
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Showing 2 changed files with 13 additions and 13 deletions Side-by-side Diff
fs/namei.c
... | ... | @@ -1962,8 +1962,8 @@ |
1962 | 1962 | } |
1963 | 1963 | } |
1964 | 1964 | |
1965 | -asmlinkage long sys_mknodat(int dfd, const char __user *filename, int mode, | |
1966 | - unsigned dev) | |
1965 | +SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode, | |
1966 | + unsigned, dev) | |
1967 | 1967 | { |
1968 | 1968 | int error; |
1969 | 1969 | char *tmp; |
... | ... | @@ -2044,7 +2044,7 @@ |
2044 | 2044 | return error; |
2045 | 2045 | } |
2046 | 2046 | |
2047 | -asmlinkage long sys_mkdirat(int dfd, const char __user *pathname, int mode) | |
2047 | +SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode) | |
2048 | 2048 | { |
2049 | 2049 | int error = 0; |
2050 | 2050 | char * tmp; |
... | ... | @@ -2291,7 +2291,7 @@ |
2291 | 2291 | goto exit2; |
2292 | 2292 | } |
2293 | 2293 | |
2294 | -asmlinkage long sys_unlinkat(int dfd, const char __user *pathname, int flag) | |
2294 | +SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag) | |
2295 | 2295 | { |
2296 | 2296 | if ((flag & ~AT_REMOVEDIR) != 0) |
2297 | 2297 | return -EINVAL; |
... | ... | @@ -2328,8 +2328,8 @@ |
2328 | 2328 | return error; |
2329 | 2329 | } |
2330 | 2330 | |
2331 | -asmlinkage long sys_symlinkat(const char __user *oldname, | |
2332 | - int newdfd, const char __user *newname) | |
2331 | +SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, | |
2332 | + int, newdfd, const char __user *, newname) | |
2333 | 2333 | { |
2334 | 2334 | int error; |
2335 | 2335 | char *from; |
... | ... | @@ -2422,9 +2422,8 @@ |
2422 | 2422 | * with linux 2.0, and to avoid hard-linking to directories |
2423 | 2423 | * and other special files. --ADM |
2424 | 2424 | */ |
2425 | -asmlinkage long sys_linkat(int olddfd, const char __user *oldname, | |
2426 | - int newdfd, const char __user *newname, | |
2427 | - int flags) | |
2425 | +SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, | |
2426 | + int, newdfd, const char __user *, newname, int, flags) | |
2428 | 2427 | { |
2429 | 2428 | struct dentry *new_dentry; |
2430 | 2429 | struct nameidata nd; |
... | ... | @@ -2624,8 +2623,8 @@ |
2624 | 2623 | return error; |
2625 | 2624 | } |
2626 | 2625 | |
2627 | -asmlinkage long sys_renameat(int olddfd, const char __user *oldname, | |
2628 | - int newdfd, const char __user *newname) | |
2626 | +SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, | |
2627 | + int, newdfd, const char __user *, newname) | |
2629 | 2628 | { |
2630 | 2629 | struct dentry *old_dir, *new_dir; |
2631 | 2630 | struct dentry *old_dentry, *new_dentry; |
fs/notify/inotify/inotify_user.c
... | ... | @@ -660,7 +660,8 @@ |
660 | 660 | return sys_inotify_init1(0); |
661 | 661 | } |
662 | 662 | |
663 | -asmlinkage long sys_inotify_add_watch(int fd, const char __user *pathname, u32 mask) | |
663 | +SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname, | |
664 | + u32, mask) | |
664 | 665 | { |
665 | 666 | struct inode *inode; |
666 | 667 | struct inotify_device *dev; |
... | ... | @@ -704,7 +705,7 @@ |
704 | 705 | return ret; |
705 | 706 | } |
706 | 707 | |
707 | -asmlinkage long sys_inotify_rm_watch(int fd, __s32 wd) | |
708 | +SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd) | |
708 | 709 | { |
709 | 710 | struct file *filp; |
710 | 711 | struct inotify_device *dev; |