[patch 055/100] cap_prctl: dont set error to 0 at no_change

Chris Wright
2009-04-23T07:43:33Z

[-- Attachment #1: cap_prctl-don-t-set-error-to-0-at-no_change.patch --]
[-- Type: text/plain, Size: 1064 bytes --]

-stable review patch. If anyone has any objections, please let us know.
---------------------

From: Serge E. Hallyn <serue@us.ibm.com>

upstream commit: 5bf37ec3e0f5eb79f23e024a7fbc8f3557c087f0

One-liner: capsh --print is broken without this patch.

In certain cases, cap_prctl returns error > 0 for success. However,
the 'no_change' label was always setting error to 0. As a result,
for example, 'prctl(CAP_BSET_READ, N)' would always return 0.
It should return 1 if a process has N in its bounding set (as
by default it does).

I'm keeping the no_change label even though it's now functionally
the same as 'error'.

Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
security/commoncap.c | 1 -
1 file changed, 1 deletion(-)

--- 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;