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'
2009-04-08 17:44:28 -07:00 · 2009-04-08 17:44:28 -07:00 · 3d4d4c8bb6
parent c71d9caf6c 5bf37ec3e0
commit 3d4d4c8bb6
1 changed files with 0 additions and 1 deletions
--- 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;