Merge ~cascardo/qa-regression-testing:master into qa-regression-testing:master

[Thadeu Lima de Souza Cascardo]

Fix tests on ARM64 with 64k pages.

[Steve Beattie (sbeattie)]

Thanks, I've gone ahead and merged these, after rebasing to fix up the author field on the commits.

I do wonder whether the better approach for the ulimit_stack_small test would be to write a little utility program that allocates a PAGESIZE amount of memory on the stack to use in place of /bin/true, rather than relying on repeated iterations to trip the test.

review: Approve

diff --git a/scripts/kernel-security/min-addr/low-mmap.c b/scripts/kernel-security/min-addr/low-mmap.c
index 64916d4..433942b 100644
--- a/scripts/kernel-security/min-addr/low-mmap.c
+++ b/scripts/kernel-security/min-addr/low-mmap.c
@@ -25,6 +25,8 @@ int main(int argc, char *argv[])
     int testsize = 0;
     if (argc>1) testsize=atoi(argv[1]);
     if (!testsize) testsize=65536;
+    testsize = (testsize+pagesize-1) & ~(pagesize-1);
+    printf("using testsize %d after aligning to pagesize %ld\n", testsize, pagesize);
 
     // drop setuidness (for MMAP_PAGE_ZERO testing)
     if (geteuid() != getuid()) {
diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
index b6558ed..e93668b 100755
--- a/scripts/test-kernel-security.py
+++ b/scripts/test-kernel-security.py
@@ -3027,14 +3027,10 @@ class KernelNonSecurityTest(KernelSecurityBaseTest):
 
         '''Origin of test https://bugzilla.redhat.com/show_bug.cgi?id=1463241 '''
 
-        if self.dpkg_arch == 'ppc64el':
-            '''https://bugs.launchpad.net/bugs/1814295'''
-            return self._skipped('WARN: intermittent failures on ppc64el (LP: #1814295)')
-
         expected = [139]
         if not self.kernel_at_least('4.4'):
             expected += [137]
-        self.assertShellExitIn(expected, self._unpriv_cmd(["sh", "-c", "ulimit -s 1 && /bin/true"]))
+        self.assertShellExitIn(expected, self._unpriv_cmd(["sh", "-c", "set -e ; ulimit -s 1 && for i in `seq 0 10`; do /bin/true ; done"]))
 
     def test_ulimit_stack_reasonable(self):
         '''Ensure reasonably small stack limits do not fail'''