projects/linux·commit 3d4d4c8b

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

3d4d4c8b · Linus Torvalds <[email protected]> · 2009-04-08 17:44:28 -07:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  cap_prctl: don't set error to 0 at 'no_change'
Commit
3d4d4c8bb63a705d95a46d299469d8a10b8b229c
Parents
c71d9caf · 5bf37ec3

Merge commit. Changes below are compared with the first parent: c71d9caf.

Changes

1 files changed · +0 −1

FileStatusAddDelContent
security/commoncap.cmodified+0−1View file

security/commoncap.c

View file
diff --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;