Skip to content

Commit

Permalink
exec: Always set cap_ambient in cap_bprm_set_creds
Browse files Browse the repository at this point in the history
An invariant of cap_bprm_set_creds is that every field in the new cred
structure that cap_bprm_set_creds might set, needs to be set every
time to ensure the fields does not get a stale value.

The field cap_ambient is not set every time cap_bprm_set_creds is
called, which means that if there is a suid or sgid script with an
interpreter that has neither the suid nor the sgid bits set the
interpreter should be able to accept ambient credentials.
Unfortuantely because cap_ambient is not reset to it's original value
the interpreter can not accept ambient credentials.

Given that the ambient capability set is expected to be controlled by
the caller, I don't think this is particularly serious.  But it is
definitely worth fixing so the code works correctly.

I have tested to verify my reading of the code is correct and the
interpreter of a sgid can receive ambient capabilities with this
change and cannot receive ambient capabilities without this change.

Cc: [email protected]
Cc: Andy Lutomirski <[email protected]>
Fixes: 5831905 ("capabilities: ambient capabilities")
Signed-off-by: "Eric W. Biederman" <[email protected]>
  • Loading branch information
ebiederm committed May 26, 2020
1 parent 6a8b55e commit a4ae32c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions security/commoncap.c
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@ int cap_bprm_set_creds(struct linux_binprm *bprm)
int ret;
kuid_t root_uid;

new->cap_ambient = old->cap_ambient;
if (WARN_ON(!cap_ambient_invariant_ok(old)))
return -EPERM;

Expand Down

0 comments on commit a4ae32c

Please sign in to comment.