From c43585bc3035423c0bb73b0ae7045ce431991768 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Nov 2025 22:08:11 +0900 Subject: [PATCH 1/3] Revert "test-network: disable several more sandbox features when running with sanitizers" This reverts commit 454ce423050890bdc8c3c90add3713592a3cab38. Unfortunately, it does not work. --- test/test-network/systemd-networkd-tests.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 2210a99c07..4d2834ba96 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -492,19 +492,7 @@ def create_service_dropin(service, command, additional_settings=None): if ubsan_options: drop_in += [f'Environment=UBSAN_OPTIONS="{ubsan_options}"'] if asan_options or lsan_options or ubsan_options: - # Disable system call filter when running with sanitizers, as they seem to call filtered syscall at - # the very end of the execution and stuck the process. See issue #39567. - drop_in += [ - 'LockPersonality=no', - 'ProtectClock=no', - 'ProtectKernelLogs=no', - 'RestrictAddressFamilies=', - 'RestrictNamespaces=no', - 'RestrictRealtime=no', - 'RestrictSUIDSGID=no', - 'SystemCallArchitectures=', - 'SystemCallFilter=', - ] + drop_in += ['SystemCallFilter='] if use_valgrind or asan_options or lsan_options or ubsan_options: drop_in += ['MemoryDenyWriteExecute=no'] if use_valgrind: From 3632d7322f46ee1ca86297ee0fe4540e76da6c74 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Nov 2025 22:10:55 +0900 Subject: [PATCH 2/3] test-network: set TimeoutStopFailureMode=abort when running with sanitizers Hopefully this provides useful data for issue #39631. --- test/test-network/systemd-networkd-tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 4d2834ba96..2f4565fe0b 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -492,7 +492,10 @@ def create_service_dropin(service, command, additional_settings=None): if ubsan_options: drop_in += [f'Environment=UBSAN_OPTIONS="{ubsan_options}"'] if asan_options or lsan_options or ubsan_options: - drop_in += ['SystemCallFilter='] + drop_in += [ + 'SystemCallFilter=', + 'TimeoutStopFailureMode=abort', + ] if use_valgrind or asan_options or lsan_options or ubsan_options: drop_in += ['MemoryDenyWriteExecute=no'] if use_valgrind: From d7cf08b735d0368758da36b18a1a7248868afbbb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Nov 2025 22:14:53 +0900 Subject: [PATCH 3/3] test-network: drop two overly verbose outputs Follow-up for 7f9c0c31d2f00f472c361868ac2184d77113db72. --- test/test-network/systemd-networkd-tests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 2f4565fe0b..7ee6ee1112 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -7356,7 +7356,6 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): output = networkctl_json('veth99') check_json(output) - print(output) data = json.loads(output) self.assertEqual(data['DHCPv4Client']['Lease']['Hostname'], 'simple-host') @@ -7369,7 +7368,6 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): output = networkctl_json('veth99') check_json(output) - print(output) data = json.loads(output) self.assertEqual(data['DHCPv4Client']['Lease']['Hostname'], 'fqdn.example.com')