Merge ~p-pisati/qa-regression-testing:master into qa-regression-testing:master

[Paolo Pisati]

Fix qa-regression-testing/test-kernel-security.py config checks on 5.15+ && ppc64el.

[Steve Beattie (sbeattie)]

Thanks for noticing and submitting the merge request, LGTM.

It might be nice to land them in the enforcement file in debian.master/config/annotations as well.

review: Approve

diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
index 74a8d5c..ce8fdef 100755
--- a/scripts/test-kernel-security.py
+++ b/scripts/test-kernel-security.py
@@ -112,6 +112,11 @@ class KernelSecurityBaseTest(testlib.TestlibCase):
         if self.kernel_at_least('4.4'):
             self.module_ronx_archs += ['arm64']
 
+        # STRICT_MODULE_RWX is supported on ppc since 5.15
+        if self.kernel_at_least('5.15'):
+            self.module_ronx_archs += ['ppc64el']
+
+
         self.sysctl = dict()
         self.sysctl['hardlink'] = 'kernel/yama/protected_nonaccess_hardlinks'
         self.sysctl['symlink'] = 'kernel/yama/protected_sticky_symlinks'
@@ -2766,8 +2771,9 @@ class KernelSecurityConfigTest(KernelSecurityBaseTest):
 
         expected = True
         if not (self.dpkg_arch in ['amd64', 'i386', 'arm64'] or
-                (self.dpkg_arch in ['s390x'] and self.kernel_at_least('5.10'))):
-            self._skipped("DEBUG_WX is an x86, arm64, and s390x (5.10 and later) arch feature only")
+                (self.dpkg_arch in ['s390x'] and self.kernel_at_least('5.10')) or
+                (self.dpkg_arch in ['ppc64el'] and self.kernel_at_least('5.15'))):
+            self._skipped("DEBUG_WX is an x86, arm64, s390x (5.10 and later) and ppc64el (5.15 and later) arch feature only")
             expected = False
         elif not self.kernel_at_least('4.4'):
             # commit for DEBUG_WX was backported to 4.4, but only