diff options
| author | Radostin Stoyanov <rstoyanov@fedoraproject.org> | 2022-08-05 16:11:49 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2022-08-08 08:56:03 +0300 |
| commit | 5f801c41296a66c924abdd443866af88aae286ea (patch) | |
| tree | 9ab5a83118339e993789f3608ca53f0227ea0367 /criu | |
| parent | 557ab8c4c8627bf20903f45cbf0f4d68ff195ccb (diff) | |
cr-check: fix check for apparmor stacking
The feature check for AppArmor stacking was introduced in
commit:
8723e3f998d1ec5f125e6600436a96f7ff9c1631
check: add a feature test for apparmor_stacking
However, on systems that don't support AppArmour, this check always
fails. As a result, `criu check --all` shows the following message:
Looks good but some kernel features are missing
which, depending on your process tree, may cause
dump or restore failure.
Reported-by: André Rösti (@andrej)
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Diffstat (limited to 'criu')
| -rw-r--r-- | criu/cr-check.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/criu/cr-check.c b/criu/cr-check.c index 0ca80192c..0f09b902a 100644 --- a/criu/cr-check.c +++ b/criu/cr-check.c @@ -1478,13 +1478,15 @@ int cr_check(void) ret |= check_newifindex(); ret |= check_pidfd_store(); ret |= check_ns_pid(); - ret |= check_apparmor_stacking(); ret |= check_network_lock_nftables(); ret |= check_sockopt_buf_lock(); ret |= check_memfd_hugetlb(); ret |= check_move_mount_set_group(); ret |= check_openat2(); ret |= check_ptrace_get_rseq_conf(); + + if (kdat.lsm == LSMTYPE__APPARMOR) + ret |= check_apparmor_stacking(); } /* |