Commit 2ecc0e4a authored by Linus Torvalds's avatar Linus Torvalds

Fix up "compat_sys_keyctl()" system call.

Fix name, and make sure that it's listed as a conditional
system call so that we stub it out to ENOSYS if the kernel
isn't compiled with key management support.
parent ac4f6755
...@@ -965,7 +965,7 @@ _GLOBAL(sys_call_table32) ...@@ -965,7 +965,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_ni_syscall /* 268 reserved for sys_kexec_load */ .llong .sys_ni_syscall /* 268 reserved for sys_kexec_load */
.llong .sys32_add_key .llong .sys32_add_key
.llong .sys32_request_key .llong .sys32_request_key
.llong .compat_keyctl .llong .compat_sys_keyctl
.balign 8 .balign 8
_GLOBAL(sys_call_table) _GLOBAL(sys_call_table)
......
...@@ -119,7 +119,7 @@ long compat_sys_shmat(int first, int second, compat_uptr_t third, int version, ...@@ -119,7 +119,7 @@ long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
long compat_sys_shmctl(int first, int second, void __user *uptr); long compat_sys_shmctl(int first, int second, void __user *uptr);
long compat_sys_semtimedop(int semid, struct sembuf __user *tsems, long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
unsigned nsems, const struct compat_timespec __user *timeout); unsigned nsems, const struct compat_timespec __user *timeout);
asmlinkage long compat_keyctl(u32 option, asmlinkage long compat_sys_keyctl(u32 option,
u32 arg2, u32 arg3, u32 arg4, u32 arg5); u32 arg2, u32 arg3, u32 arg4, u32 arg5);
asmlinkage ssize_t compat_sys_readv(unsigned long fd, asmlinkage ssize_t compat_sys_readv(unsigned long fd,
......
...@@ -286,6 +286,7 @@ cond_syscall(compat_set_mempolicy) ...@@ -286,6 +286,7 @@ cond_syscall(compat_set_mempolicy)
cond_syscall(sys_add_key) cond_syscall(sys_add_key)
cond_syscall(sys_request_key) cond_syscall(sys_request_key)
cond_syscall(sys_keyctl) cond_syscall(sys_keyctl)
cond_syscall(compat_sys_keyctl)
cond_syscall(compat_sys_socketcall) cond_syscall(compat_sys_socketcall)
/* arch-specific weak syscall entries */ /* arch-specific weak syscall entries */
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* registers on taking a 32-bit syscall are zero * registers on taking a 32-bit syscall are zero
* - if you can, you should call sys_keyctl directly * - if you can, you should call sys_keyctl directly
*/ */
asmlinkage long compat_keyctl(u32 option, asmlinkage long compat_sys_keyctl(u32 option,
u32 arg2, u32 arg3, u32 arg4, u32 arg5) u32 arg2, u32 arg3, u32 arg4, u32 arg5)
{ {
switch (option) { switch (option) {
...@@ -75,4 +75,4 @@ asmlinkage long compat_keyctl(u32 option, ...@@ -75,4 +75,4 @@ asmlinkage long compat_keyctl(u32 option,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
} /* end compat_keyctl() */ } /* end compat_sys_keyctl() */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment