[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: update the XFS quota bug workaround

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: update the XFS quota bug workaround

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 1a7541ad66373cf791e9123344cbace016ffc682
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2021-05-05T15:59:35+02:00
            Stats  : +9/-10 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/1a7541ad66373cf791e9123344cbace016ffc682?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: update the XFS quota bug workaround

The bugfix has been backported in RHEL-8.4, so we can now replace this
with a kernel version check, increasing the coverage on RHEL-8.4 and
above.

Verified that the testsuite still passes on RHEL-8.3, 8.4, and RHEL-9.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index ad700e2..73ce274 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -379,16 +379,15 @@ rlJournalStart
                 rlRun "sed -i 's/SCTP_SEND_FAILED_EVENT/SCTP_STREAM_CHANGE_EVENT + 1/g' tests/sctp/*.c" 0 \
                     "Fix SCTP test compilation on old RHEL kernels"
             fi
-
-            # Needs:
-            # e4cfa05e9bfe ("selinux: Add xfs quota command types")
-            # (not backported to any RHEL at this point - TODO update the check once it is)
-            script1='s/\$test_count += 62;/$test_count = 55;/g'
-            script2='s/\$quota_checks += 1;/$quota_checks = 0;/g'
-            # for some reason this is needed for older RHEL 7 versions...
-            script3='s/\$test_count += 69;/$test_count = 55;/g'
-            rlRun "sed -i -E -e '$script1' -e '$script2' -e '$script3' tests/filesystem/test" 0 \
-                "Apply workaround for missing XFS quota checks"
+            if kver_lt 4.18.0-252; then
+                # 8a4d5985551b [security] selinux: Add xfs quota command types
+                script1='s/\$test_count += 62;/$test_count = 55;/g'
+                script2='s/\$quota_checks += 1;/$quota_checks = 0;/g'
+                # for some reason this is needed for older RHEL 7 versions...
+                script3='s/\$test_count += 69;/$test_count = 55;/g'
+                rlRun "sed -i -E -e '$script1' -e '$script2' -e '$script3' tests/filesystem/test" 0 \
+                    "Apply workaround for missing XFS quota checks"
+            fi
         fi
 
         # CKI mainline kernels don't ship with module build infrastructure