diff options
| author | Linus Torvalds | 2009-04-09 02:44:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-09 02:44:28 +0200 |
| commit | 3d4d4c8bb63a705d95a46d299469d8a10b8b229c (patch) | |
| tree | a1f84ab852eea06c156254333513621c1f1c8fa6 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | cap_prctl: don't set error to 0 at 'no_change' (diff) | |
| download | kernel-qcow2-linux-3d4d4c8bb63a705d95a46d299469d8a10b8b229c.tar.gz kernel-qcow2-linux-3d4d4c8bb63a705d95a46d299469d8a10b8b229c.tar.xz kernel-qcow2-linux-3d4d4c8bb63a705d95a46d299469d8a10b8b229c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* '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'
| -rw-r--r-- | security/commoncap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 7cd61a5f5205..beac0258c2a8 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; |