Commit 3d4d4c8b authored Apr 08, 2009 by Linus Torvalds

Merge branch 'for-linus' of...

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'

parents c71d9caf 5bf37ec3

security/commoncap.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -916,7 +916,6 @@ changed:
		return commit_creds(new);

		no_change:
		error = 0;
		error:
		abort_creds(new);
		return error;