diff options
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 572d247957fb..c16beb25fd0a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -1358,6 +1358,9 @@ static void audit_log_exit(void) | |||
1358 | audit_log_cap(ab, "pi", &axs->new_pcap.inheritable); | 1358 | audit_log_cap(ab, "pi", &axs->new_pcap.inheritable); |
1359 | audit_log_cap(ab, "pe", &axs->new_pcap.effective); | 1359 | audit_log_cap(ab, "pe", &axs->new_pcap.effective); |
1360 | audit_log_cap(ab, "pa", &axs->new_pcap.ambient); | 1360 | audit_log_cap(ab, "pa", &axs->new_pcap.ambient); |
1361 | audit_log_format(ab, " frootid=%d", | ||
1362 | from_kuid(&init_user_ns, | ||
1363 | axs->fcap.rootid)); | ||
1361 | break; } | 1364 | break; } |
1362 | 1365 | ||
1363 | } | 1366 | } |
@@ -2271,6 +2274,7 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm, | |||
2271 | ax->fcap.permitted = vcaps.permitted; | 2274 | ax->fcap.permitted = vcaps.permitted; |
2272 | ax->fcap.inheritable = vcaps.inheritable; | 2275 | ax->fcap.inheritable = vcaps.inheritable; |
2273 | ax->fcap.fE = !!(vcaps.magic_etc & VFS_CAP_FLAGS_EFFECTIVE); | 2276 | ax->fcap.fE = !!(vcaps.magic_etc & VFS_CAP_FLAGS_EFFECTIVE); |
2277 | ax->fcap.rootid = vcaps.rootid; | ||
2274 | ax->fcap_ver = (vcaps.magic_etc & VFS_CAP_REVISION_MASK) >> VFS_CAP_REVISION_SHIFT; | 2278 | ax->fcap_ver = (vcaps.magic_etc & VFS_CAP_REVISION_MASK) >> VFS_CAP_REVISION_SHIFT; |
2275 | 2279 | ||
2276 | ax->old_pcap.permitted = old->cap_permitted; | 2280 | ax->old_pcap.permitted = old->cap_permitted; |