Merge ~alexmurray/qa-regression-testing:update-test-gcc-security-for-lp-2007544 into qa-regression-testing:master

[Alex Murray]

[Pavel Kopylov (pkopylov)]

Great, it has worked fine for me on these systems: Ubuntu 16.04, Ubuntu 18.04, and Ubuntu 20.04.

[Steve Beattie (sbeattie)]

Apologies, I've not reviewed this in any depth, but one nit:

On Fri, Feb 17, 2023 at 12:56:17AM -0000, Alex Murray wrote:
> + # Backtrace expected? glibc removed this functionality
> + # (https://github.com/bminor/glibc/commit/a289ea09ea843ced6e5277c2f2e63c357bc7f9a3)

Not sure what that github repo is, but the official glibc git repo link
for this commit would be:

  https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=a289ea09ea843ced6e5277c2f2e63c357bc7f9a3

> + # but even before this it was broken since 2017 due to a bug in
> + # https://github.com/bminor/glibc/commit/ed421fca42fd9b4cab7c66e77894b8dd7ca57ed0

and similarly

  https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=ed421fca42fd9b4cab7c66e77894b8dd7ca57ed0

--
Steve Beattie
<email address hidden>

[Alex Murray (alexmurray)]

Thanks sbeattie - I have fixed those links up in https://git.launchpad.net/~alexmurray/qa-regression-testing/commit/?id=a3598bc48def5d2dc882be07bbb6c94b89a6686b

diff --git a/scripts/test-gcc-security.py b/scripts/test-gcc-security.py
index 53bfdec..64a8647 100755
--- a/scripts/test-gcc-security.py
+++ b/scripts/test-gcc-security.py
@@ -30,6 +30,7 @@ import os
 import subprocess
 import unittest
 import testlib
+import re
 
 
 class GccSecurityTest00(testlib.TestlibCase):
@@ -94,6 +95,10 @@ class GccSecurityTest00(testlib.TestlibCase):
                     cmd = ['./%s' % (target), mode, 'A' * 40]
                     rc, output = self.shell_cmd(cmd)
                     self.assertEqual(rc, 0)
+                else:
+                    cmd = []
+                    output = ''
+                    rc = -1
 
                 # stop when we hit either SIGABRT or SIGSEGV, whichever
                 # comes first to detect the overflow needed to trigger
@@ -124,11 +129,16 @@ class GccSecurityTest00(testlib.TestlibCase):
                 if not mapping[target]:
                     rc_expected = -11
                 self.assertEqual(rc, rc_expected, 'rc(%d) != %d: %s\n' % (rc, rc_expected, " ".join(cmd)) + output)
-                wanted = '*** %s ***: ./%s terminated\n' % (abort_string, target)
-                self.assertEqual(wanted in output, mapping[target], "'%s' %s in output of '%s':\n%s" % (wanted, ['NOT', 'is'][mapping[target]], " ".join(cmd), output))
+                wanted = '\\*\\*\\* %s \\*\\*\\*: .*terminated\n' % (abort_string)
+                self.assertEqual(re.search(wanted, output) is not None, mapping[target], "'%s' %s in output of '%s':\n%s" % (wanted, ['NOT', 'is'][mapping[target]], " ".join(cmd), output))
 
-                # Backtrace expected?
+                # Backtrace expected?  glibc removed this functionality
+                # (https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=a289ea09ea843ced6e5277c2f2e63c357bc7f9a3)
+                # but even before this it was broken since 2017 due to a bug in
+                # https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=ed421fca42fd9b4cab7c66e77894b8dd7ca57ed0
                 backtrace_expected = mapping[target]
+                if self.lsb_release['Release'] >= 18.04:
+                    backtrace_expected = False
                 if self.dpkg_arch == 'armel' or \
                    (self.lsb_release['Release'] > 12.04 and stack_protector):
                     backtrace_expected = False
@@ -269,7 +279,7 @@ class GccSecurityTest00(testlib.TestlibCase):
             output = self.make_target(target, expected=compile_rc)
             for func in expected_funcs + unexpected_funcs:
                 wanted = warning % (func)
-                self.assertEqual(wanted in output, func in expected_funcs and mapping[target], "'%s' (%d, %s) in output of %s:\n" % (wanted, mapping[target], ", ".join(expected_funcs), target) + output)
+                self.assertEqual(re.search(wanted, output) is not None, func in expected_funcs and mapping[target], "'%s' (%d, %s) in output of %s:\n" % (wanted, mapping[target], ", ".join(expected_funcs), target) + output)
 
             if not compiles:
                 continue
@@ -300,7 +310,7 @@ class GccSecurityTest00(testlib.TestlibCase):
                 self.announce("-fwrite")
                 unexpected_funcs += ['fwrite']
 
-        self._test_warnings('warn-unchecked', "warning: ignoring return value of '%s', declared with attribute warn_unused_result", expected_funcs, unexpected_funcs)
+        self._test_warnings('warn-unchecked', "warning: ignoring return value of '%s',? declared with attribute '?warn_unused_result'?", expected_funcs, unexpected_funcs)
 
     # Intrepid and later
     # Technically, this is a glibc run-time test...
@@ -404,7 +414,12 @@ class GccSecurityTest00(testlib.TestlibCase):
             compiles = True
             rc = -11
 
-        self._test_warnings('missing-mode', "warning: call to %s will always overflow destination buffer", expected_funcs, unexpected_funcs, compiles=compiles, rc_wanted=rc)
+        warning = "warning: call to %s will always overflow destination buffer"
+        if self.lsb_release['Release'] >= 18.04:
+            # on newer gcc the warnings are more detailed so don't check for
+            # exact text but instead just that they were generated
+            warning = "warning: '%s'"
+        self._test_warnings('missing-mode', warning, expected_funcs, unexpected_funcs, compiles=compiles, rc_wanted=rc)
 
     def test_30_stack_protector_all(self):
         '''gcc -fstack-protector-all works when requested (LP: #691722)'''
@@ -442,7 +457,9 @@ class GccSecurityTest00(testlib.TestlibCase):
             self.make_target(target)
             rc, output = self.shell_cmd(['readelf', '-h', target])
             self.assertEqual(rc, 0, output)
-            self.assertTrue(mapping[target] == ('DYN (Shared object file)' in output), output)
+            self.assertTrue(mapping[target] ==
+                            (re.search('Type:\\s+DYN\\s+\\((Shared object file|Position-Independent Executable file)\\)', output) is not None),
+                            output)
 
     # yakkety and later
     def test_60_bind_now(self):
@@ -467,7 +484,7 @@ class GccSecurityTest00(testlib.TestlibCase):
             self.make_target(target)
             rc, output = self.shell_cmd(['readelf', '-d', target])
             self.assertEqual(rc, 0, output)
-            self.assertTrue(mapping[target] == ('(BIND_NOW)' in output), target + ": " + output)
+            self.assertTrue(mapping[target] == ('BIND_NOW' in output), target + ": " + output)
 
 
 # Secondary class that enables all the "by default" tests so features can