summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2020-06-05 05:30:03 +0300
committerJoel Stanley <joel@jms.id.au>2020-06-05 05:30:09 +0300
commit080667efe09daf4f51236f3e90f4e3cd729c3bb9 (patch)
tree4078f9052671a72f69c2444165fba5fd9c117761 /security
parent55be3803e2451029012a99e90843af1c286accfc (diff)
parent55852b3fd146ce90d4d4306b467261f2c4869293 (diff)
downloadlinux-080667efe09daf4f51236f3e90f4e3cd729c3bb9.tar.xz
Merge tag 'v5.4.44' into dev-5.4
This is the 5.4.44 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'security')
-rw-r--r--security/commoncap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index f4ee0ae106b2..0ca31c8bc0b1 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -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;