2009-04-08 21:56:41

by Serge E. Hallyn

[permalink] [raw]
Subject: [PATCH 1/1] 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 <[email protected]>
Acked-by: David Howells <[email protected]>
---
security/commoncap.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/security/commoncap.c b/security/commoncap.c
index 7cd61a5..beac025 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;
--
1.5.6.3