From 326425fb4dfd20c8410be46b6c2c0ea865436de8 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 2 Oct 2022 22:51:56 +0200 Subject: [PATCH] test: pre-load ASan's DSO for iscsi-init.service The iscsi-init.service calls `sh` which might, in certain circumstances, pull in instrumented systemd NSS modules causing `sh` to fail. Let's mitigate this by pulling in an env file crafted by `create_asan_wrapper()` that (among others) pre-loads ASan's DSO. --- test/test-functions | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/test-functions b/test/test-functions index 06652cfad64..d1e3e993f9c 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1047,6 +1047,14 @@ install_iscsi() { # [0] https://github.com/open-iscsi/open-iscsi/commit/f37d5b653f9f251845db3f29b1a3dcb90ec89731 if [[ ! -e /etc/iscsi/initiatorname.iscsi ]]; then image_install "${ROOTLIBDIR:?}"/system/iscsi-init.service + if get_bool "$IS_BUILT_WITH_ASAN"; then + # The iscsi-init.service calls `sh` which might, in certain circumstances, + # pull in instrumented systemd NSS modules causing `sh` to fail. Let's mitigate + # this by pulling in an env file crafted by `create_asan_wrapper()` that + # (among others) pre-loads ASan's DSO. + mkdir -p "${initdir:?}/etc/systemd/system/iscsi-init.service.d/" + printf "[Service]\nEnvironmentFile=/usr/lib/systemd/systemd-asan-env" >"${initdir:?}/etc/systemd/system/iscsi-init.service.d/asan-env.conf" + fi else inst_simple "/etc/iscsi/initiatorname.iscsi" fi