Skip to content

Commit 45f903c

Browse files
committed
tests/int: update info about EL9 kernel
The issue quoted is now fixed, so add some information about the fixed kernel version, and remove links to older discussions about idmapped mounts security. We can actually remove all of it for now, but let's keep it. Change the skip message to say which kernel is required. Amends commit b460dc3. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 61ce698 commit 45f903c

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

tests/integration/helpers.bash

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -771,25 +771,15 @@ function requires_idmap_fs() {
771771
;;
772772
*operation\ not\ permitted)
773773
if uname -r | grep -q el9; then
774-
# centos kernel 5.14.0-200 does not permit using ID map mounts due to a
775-
# specific patch added to their sources:
774+
# Older EL9 kernels did not permit using ID map mounts
775+
# due to a specific patch added to their sources:
776776
# https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/131
777777
#
778-
# There doesn't seem to be any technical reason behind
779-
# it, none was provided in numerous examples, like:
780-
# https://lore.kernel.org/lkml/[email protected]/T/#m3a9df31aa183e8797c70bc193040adfd601399ad
781-
# https://lore.kernel.org/lkml/[email protected]/T/#m59cdad9630d5a279aeecd0c1f117115144bc15eb
782-
# https://lore.kernel.org/lkml/[email protected]
783-
# https://lore.kernel.org/lkml/20210510125147.tkgeurcindldiwxg@wittgenstein
778+
# That patch was reverted in:
779+
# https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2179
784780
#
785-
# So, sadly we just need to skip this on centos.
786-
#
787-
# TODO Nonetheless, there are ongoing works to revert the patch
788-
# deactivating ID map mounts:
789-
# https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2179/diffs?commit_id=06f4fe946394cb94d2cf274aa7f3091d8f8469dc
790-
# Once this patch is merge, we should be able to remove the below skip
791-
# if the revert is backported or if CI centos kernel is upgraded.
792-
skip "sadly, centos kernel 5.14 does not permit using ID map mounts"
781+
# The above revert is included into the kernel 5.14.0-334.el9.
782+
skip "Needs kernel >= 5.14.0-334.el9"
793783
fi
794784
;;
795785
esac

0 commit comments

Comments
 (0)