Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
Merge commit. Changes below are compared with the first parent: c71d9caf.
Changes
1 files changed · +0 −1
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| security/commoncap.c | modified | +0 | −1 | View file |
security/commoncap.c
View filediff --git a/security/commoncap.c b/security/commoncap.c
index 7cd61a5..beac025 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -916,7 +916,6 @@ changed:
return commit_creds(new);
no_change:
- error = 0;
error:
abort_creds(new);
return error;