git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing: Fix trace_seq_printf() return value
[safe/jmp/linux-2.6]
/
kernel
/
capability.c
diff --git
a/kernel/capability.c
b/kernel/capability.c
index
36b4b4d
..
4e17041
100644
(file)
--- a/
kernel/capability.c
+++ b/
kernel/capability.c
@@
-161,7
+161,7
@@
static inline int cap_get_target_pid(pid_t pid, kernel_cap_t *pEp,
*
* Returns 0 on success and < 0 on error.
*/
*
* Returns 0 on success and < 0 on error.
*/
-
asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t
dataptr)
+
SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t,
dataptr)
{
int ret = 0;
pid_t pid;
{
int ret = 0;
pid_t pid;
@@
-235,7
+235,7
@@
asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t dataptr)
*
* Returns 0 on success and < 0 on error.
*/
*
* Returns 0 on success and < 0 on error.
*/
-
asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t
data)
+
SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t,
data)
{
struct __user_cap_data_struct kdata[_KERNEL_CAPABILITY_U32S];
unsigned i, tocopy;
{
struct __user_cap_data_struct kdata[_KERNEL_CAPABILITY_U32S];
unsigned i, tocopy;
@@
-280,9
+280,7
@@
asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
if (ret < 0)
goto error;
if (ret < 0)
goto error;
- ret = audit_log_capset(pid, new, current_cred());
- if (ret < 0)
- return ret;
+ audit_log_capset(pid, new, current_cred());
return commit_creds(new);
return commit_creds(new);
@@
-308,7
+306,7
@@
int capable(int cap)
BUG();
}
BUG();
}
- if (
has_capability(current, cap)
) {
+ if (
security_capable(cap) == 0
) {
current->flags |= PF_SUPERPRIV;
return 1;
}
current->flags |= PF_SUPERPRIV;
return 1;
}