summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKP Singh <kpsingh@google.com>2020-12-03 19:14:35 +0000
committerAndrii Nakryiko <andrii@kernel.org>2020-12-03 11:20:21 -0800
commit1ee076719d4e14c005f375c50731ed44eb48fee4 (patch)
tree92ff769902cb993f171026231cd9c751002a3433 /tools
parent3db980449bc3b9765c78210787bcbf4305636982 (diff)
downloadlinux-stable-1ee076719d4e14c005f375c50731ed44eb48fee4.tar.gz
linux-stable-1ee076719d4e14c005f375c50731ed44eb48fee4.tar.bz2
linux-stable-1ee076719d4e14c005f375c50731ed44eb48fee4.zip
selftests/bpf: Ensure securityfs mount before writing ima policy
SecurityFS may not be mounted even if it is enabled in the kernel config. So, check if the mount exists in /proc/mounts by parsing the file and, if not, mount it on /sys/kernel/security. Fixes: 34b82d3ac105 ("bpf: Add a selftest for bpf_ima_inode_hash") Reported-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: KP Singh <kpsingh@google.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20201203191437.666737-3-kpsingh@chromium.org
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/selftests/bpf/ima_setup.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/ima_setup.sh b/tools/testing/selftests/bpf/ima_setup.sh
index 137f2d32598f..b1ee4bf06996 100755
--- a/tools/testing/selftests/bpf/ima_setup.sh
+++ b/tools/testing/selftests/bpf/ima_setup.sh
@@ -14,6 +14,20 @@ usage()
exit 1
}
+ensure_mount_securityfs()
+{
+ local securityfs_dir=$(grep "securityfs" /proc/mounts | awk '{print $2}')
+
+ if [ -z "${securityfs_dir}" ]; then
+ securityfs_dir=/sys/kernel/security
+ mount -t securityfs security "${securityfs_dir}"
+ fi
+
+ if [ ! -d "${securityfs_dir}" ]; then
+ echo "${securityfs_dir}: securityfs is not mounted" && exit 1
+ fi
+}
+
setup()
{
local tmp_dir="$1"
@@ -33,6 +47,7 @@ setup()
cp "${TEST_BINARY}" "${mount_dir}"
local mount_uuid="$(blkid ${loop_device} | sed 's/.*UUID="\([^"]*\)".*/\1/')"
+ ensure_mount_securityfs
echo "measure func=BPRM_CHECK fsuuid=${mount_uuid}" > ${IMA_POLICY_FILE}
}