From a6738260036b0e88b0776490d3f8ab6c3bc7bbac Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 16 Jul 2025 09:41:50 +0900 Subject: [PATCH] TEST-07-PID1: check if PrivateBPF=yes is gracefully ignored --- test/units/TEST-07-PID1.private-bpf.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/test/units/TEST-07-PID1.private-bpf.sh b/test/units/TEST-07-PID1.private-bpf.sh index ce25fc4b16b..d9c02180551 100755 --- a/test/units/TEST-07-PID1.private-bpf.sh +++ b/test/units/TEST-07-PID1.private-bpf.sh @@ -13,12 +13,26 @@ systemd-run --wait \ grep -q '/sys/fs/bpf .* ro,' /proc/mounts # Check that with PrivateBPF=yes, a new bpffs instance is mounted -systemd-run --wait \ +if ! systemd-run --wait \ -p PrivateUsers=yes \ -p PrivateMounts=yes \ -p DelegateNamespaces=mnt \ -p PrivateBPF=yes \ - grep -q '^none /sys/fs/bpf bpf rw' /proc/mounts + grep -q '^none /sys/fs/bpf bpf rw' /proc/mounts; then + + # If it does not work, maybe the kernel is old or the system has buggy ubuntu kernel. + # Let's check if PrivateBPF=yes is ignored gracefully in that case. + systemd-run --wait \ + -p PrivateUsers=yes \ + -p PrivateMounts=yes \ + -p DelegateNamespaces=mnt \ + -p ProtectKernelTunables=yes \ + -p PrivateBPF=yes \ + grep -q '/sys/fs/bpf .* ro,' /proc/mounts + + # Skip all remaining tests. + exit 0 +fi # Check that when specifying the delegate arguments, the mount options are set properly check_mount_opts() { -- 2.47.3