summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2009-04-08 16:55:58 -0500
committerJames Morris <jmorris@namei.org>2009-04-09 09:12:03 +1000
commit5bf37ec3e0f5eb79f23e024a7fbc8f3557c087f0 (patch)
tree555033e32330726df31fa68244656e11eae39490 /security
parent577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff)
cap_prctl: don't set error to 0 at 'no_change'
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>
Diffstat (limited to 'security')
-rw-r--r--security/commoncap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index 7cd61a5f520..beac0258c2a 100644
--- 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;