Merge ~enr0n/ubuntu/+source/systemd:focal-lp1958284-and-lp1871538 into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-focal

[Nick Rosbrook]

[Lukas Märdian (slyon)]

Thank you very much. This LGTM!
Also the PPA build and PPA autopkgtests in https://autopkgtest.ubuntu.com/results/autopkgtest-focal-enr0n-systemd-245/?format=plain are all green!

Sponsoring & Merging!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c133951..daf4f12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,18 @@ systemd (245.4-4ubuntu3.16) UNRELEASED; urgency=medium
     File: debian/patches/lp1955997-add-a-allowlist-to-unblock-intel-hid-on-HP-mach.patch
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=88a859eaddb6c9a611fcbc44edab441aef4c4355
 
- -- Lukas Märdian <[e-mail]>  Tue, 08 Feb 2022 17:39:41 +0100
+  [ Nick Rosbrook ]
+  * Prevent arguments from being overwritten with defaults at shutdown (LP: #1958284)
+    File: debian/patches/lp1958284-core-move-reset_arguments-to-the-end-of-main-s-finish.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e61052bd1f20bcc54e7417542c6d445cf5040f56
+
+  [ Lukas Märdian ]
+  * Fix deadlock between pid1 and dbus-daemon (LP: #1871538)
+    Author: Lukas Märdian
+    File: debian/patches/pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e3aacfa26e3fc6df369e6f28e740389ae0020907
+
+ -- Nick Rosbrook <[e-mail]>  Wed, 23 Mar 2022 09:29:33 -0400
 
 systemd (245.4-4ubuntu3.15) focal-security; urgency=medium
 
diff --git a/debian/patches/lp1958284-core-move-reset_arguments-to-the-end-of-main-s-finish.patch b/debian/patches/lp1958284-core-move-reset_arguments-to-the-end-of-main-s-finish.patch
 new file mode 100644
index 0000000..1ae2fb6
--- /dev/null
+++ b/debian/patches/lp1958284-core-move-reset_arguments-to-the-end-of-main-s-finish.patch
@@ -0,0 +1,48 @@
+Description: core: move reset_arguments() to the end of main's finish
+Origin: upstream, https://github.com/systemd/systemd/commit/7d9eea2bd3d4f83668c7a78754d201b22
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1958284
+---
+From: Anita Zhang <[e-mail]>
+Date: Thu, 17 Sep 2020 01:49:17 -0700
+Subject: core: move reset_arguments() to the end of main's finish
+
+Fixes #16991
+
+fb39af4ce42d7ef9af63009f271f404038703704 replaced `free_arguments()` with
+`reset_arguments()`, which frees arg_* variables as before, but also resets all
+of them to the default values. `reset_arguments()` was positioned
+in such a way that it overrode some arg_* values still in use at shutdown.
+
+To avoid further unintentional resets, I moved `reset_arguments()`
+right before the return, when nothing else will be using the arg_* variables.
+---
+ src/core/main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/main.c b/src/core/main.c
+index e32ed02..615949b 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -2717,7 +2717,6 @@ finish:
+                 m = manager_free(m);
+         }
+ 
+-        reset_arguments();
+         mac_selinux_finish();
+ 
+         if (reexecute)
+@@ -2744,6 +2743,7 @@ finish:
+                  * in become_shutdown() so normally we cannot free them yet. */
+                 watchdog_free_device();
+                 arg_watchdog_device = mfree(arg_watchdog_device);
++                reset_arguments();
+                 return retval;
+         }
+ #endif
+@@ -2769,5 +2769,6 @@ finish:
+                 freeze_or_exit_or_reboot();
+         }
+ 
++        reset_arguments();
+         return retval;
+ }
diff --git a/debian/patches/pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch b/debian/patches/pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
 new file mode 100644
index 0000000..df7456a
--- /dev/null
+++ b/debian/patches/pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
@@ -0,0 +1,91 @@
+From: Lennart Poettering <[e-mail]>
+Date: Thu, 17 Feb 2022 14:49:54 +0100
+Subject: pid1: set SYSTEMD_NSS_DYNAMIC_BYPASS=1 env var for dbus-daemon
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+There's currently a deadlock between PID 1 and dbus-daemon: in some
+cases dbus-daemon will do NSS lookups (which are blocking) at the same
+time PID 1 synchronously blocks on some call to dbus-daemon. Let's break
+that by setting SYSTEMD_NSS_DYNAMIC_BYPASS=1 env var for dbus-daemon,
+which will disable synchronously blocking varlink calls from nss-systemd
+to PID 1.
+
+In the long run we should fix this differently: remove all synchronous
+calls to dbus-daemon from PID 1. This is not trivial however: so far we
+had the rule that synchronous calls from PID 1 to the dbus broker are OK
+as long as they only go to interfaces implemented by the broke itself
+rather than services reachable through it. Given that the relationship
+between PID 1 and dbus is kinda special anyway, this was considered
+acceptable for the sake of simplicity, since we quite often need
+metadata about bus peers from the broker, and the asynchronous logic
+would substantially complicate even the simplest method handlers.
+
+This mostly reworks the existing code that sets SYSTEMD_NSS_BYPASS_BUS=
+(which is a similar hack to deal with deadlocks between nss-systemd and
+dbus-daemon itself) to set SYSTEMD_NSS_DYNAMIC_BYPASS=1 instead. No code
+was checking SYSTEMD_NSS_BYPASS_BUS= anymore anyway, and it used to
+solve a similar problem, hence it's an obvious piece of code to rework
+like this.
+
+Issue originally tracked down by Lukas Märdian. This patch is inspired
+and closely based on his patch:
+
+       https://github.com/systemd/systemd/pull/22038
+
+Fixes: #15316
+Co-authored-by: Lukas Märdian <[e-mail]>
+---
+ src/core/execute.c | 10 +++++-----
+ src/core/execute.h |  2 +-
+ src/core/service.c |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/execute.c b/src/core/execute.c
+index ca40874..b8d1ae4 100644
+--- a/src/core/execute.c
++++ b/src/core/execute.c
+@@ -1829,11 +1829,11 @@ static int build_environment(
+                 our_env[n_env++] = x;
+         }
+ 
+-        /* If this is D-Bus, tell the nss-systemd module, since it relies on being able to use D-Bus look up dynamic
+-         * users via PID 1, possibly dead-locking the dbus daemon. This way it will not use D-Bus to resolve names, but
+-         * check the database directly. */
+-        if (p->flags & EXEC_NSS_BYPASS_BUS) {
+-                x = strdup("SYSTEMD_NSS_BYPASS_BUS=1");
++        /* If this is D-Bus, tell the nss-systemd module, since it relies on being able to use blocking
++         * Varlink calls back to us for look up dynamic users in PID 1. Break the deadlock between D-Bus and
++         * PID 1 by disabling use of PID1' NSS interface for looking up dynamic users. */
++        if (p->flags & EXEC_NSS_DYNAMIC_BYPASS) {
++                x = strdup("SYSTEMD_NSS_DYNAMIC_BYPASS=1");
+                 if (!x)
+                         return -ENOMEM;
+                 our_env[n_env++] = x;
+diff --git a/src/core/execute.h b/src/core/execute.h
+index 4c7a5b8..2a261f3 100644
+--- a/src/core/execute.h
++++ b/src/core/execute.h
+@@ -348,7 +348,7 @@ typedef enum ExecFlags {
+         EXEC_APPLY_TTY_STDIN   = 1 << 2,
+         EXEC_PASS_LOG_UNIT     = 1 << 3, /* Whether to pass the unit name to the service's journal stream connection */
+         EXEC_CHOWN_DIRECTORIES = 1 << 4, /* chown() the runtime/state/cache/log directories to the user we run as, under all conditions */
+-        EXEC_NSS_BYPASS_BUS    = 1 << 5, /* Set the SYSTEMD_NSS_BYPASS_BUS environment variable, to disable nss-systemd for dbus */
++        EXEC_NSS_DYNAMIC_BYPASS    = 1 << 5, /* Set the SYSTEMD_NSS_DYNAMIC_BYPASS environment variable, to disable nss-systemd blocking on PID 1, for use by dbus-daemon */
+         EXEC_CGROUP_DELEGATE   = 1 << 6,
+         EXEC_IS_CONTROL        = 1 << 7,
+         EXEC_CONTROL_CGROUP    = 1 << 8, /* Place the process not in the indicated cgroup but in a subcgroup '/.control', but only EXEC_CGROUP_DELEGATE and EXEC_IS_CONTROL is set, too */
+diff --git a/src/core/service.c b/src/core/service.c
+index 7b90822..debd9d6 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -1569,7 +1569,7 @@ static int service_spawn(
+                 return -ENOMEM;
+ 
+         /* System D-Bus needs nss-systemd disabled, so that we don't deadlock */
+-        SET_FLAG(exec_params.flags, EXEC_NSS_BYPASS_BUS,
++        SET_FLAG(exec_params.flags, EXEC_NSS_DYNAMIC_BYPASS,
+                  MANAGER_IS_SYSTEM(UNIT(s)->manager) && unit_has_name(UNIT(s), SPECIAL_DBUS_SERVICE));
+ 
+         strv_free_and_replace(exec_params.environment, final_env);
diff --git a/debian/patches/series b/debian/patches/series
index deef92d..e0a85c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -171,3 +171,5 @@ CVE-2021-3997-2.patch
 CVE-2021-3997-3.patch
 lp1946388-sd-journal-don-t-check-namespaces-if-we-have-no-name.patch
 lp1955997-add-a-allowlist-to-unblock-intel-hid-on-HP-mach.patch
+lp1958284-core-move-reset_arguments-to-the-end-of-main-s-finish.patch
+pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch