Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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'
  • Loading branch information
Linus Torvalds committed Apr 9, 2009
2 parents c71d9ca + 5bf37ec commit 3d4d4c8
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion security/commoncap.c
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,6 @@ int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
return commit_creds(new);

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

0 comments on commit 3d4d4c8

Please sign in to comment.