projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[linux-2.6-block.git]
/
kernel
/
capability.c
diff --git
a/kernel/capability.c
b/kernel/capability.c
index df62f53f84acc03be44c318c50a6a5b198d7e3b1..688926e496be18737d8ae37af9fe807f75185f56 100644
(file)
--- a/
kernel/capability.c
+++ b/
kernel/capability.c
@@
-280,9
+280,7
@@
asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
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);