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'
This commit is contained in:
commit
3d4d4c8bb6
|
@ -916,7 +916,6 @@ changed:
|
||||||
return commit_creds(new);
|
return commit_creds(new);
|
||||||
|
|
||||||
no_change:
|
no_change:
|
||||||
error = 0;
|
|
||||||
error:
|
error:
|
||||||
abort_creds(new);
|
abort_creds(new);
|
||||||
return error;
|
return error;
|
||||||
|
|
Loading…
Reference in New Issue