Merge ~fourdollars/ubuntu/+source/systemd:ubuntu-disco into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-disco

[Shih-Yuan Lee]

[Robert Ancell (robert-ancell)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 26816f5..0b600be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+systemd (240-6ubuntu5.7) disco; urgency=medium
+
+  * d/p/d/Revert-udev-network-device-renaming-immediately-give.patch:
+    - udev: add Revert-udev-network-device-renaming-immediately-give.patch back
+      Dropping this patch will cause the persistent network regression.
+      (LP: #1842651)
+
+ -- Shih-Yuan Lee (FourDollars) <[e-mail]>  Thu, 05 Sep 2019 19:01:29 +0800
+
+systemd (240-6ubuntu5.6) disco-security; urgency=medium
+
+  * SECURITY UPDATE: Unprivileged users are granted access to privileged
+    systemd-resolved D-Bus methods
+    - d/p/0001-shared-but-util-drop-trusted-annotation-from-bus_ope.patch:
+      drop trusted annotation from bus_open_system_watch_bind_with_description()
+    - CVE-2019-15718
+
+ -- Chris Coulson <[e-mail]>  Thu, 29 Aug 2019 23:29:13 +0100
+
 systemd (240-6ubuntu5.4) disco; urgency=medium
 
   [ You-Sheng Yang ]
diff --git a/debian/patches/0001-shared-but-util-drop-trusted-annotation-from-bus_ope.patch b/debian/patches/0001-shared-but-util-drop-trusted-annotation-from-bus_ope.patch
 new file mode 100644
index 0000000..8186f70
--- /dev/null
+++ b/debian/patches/0001-shared-but-util-drop-trusted-annotation-from-bus_ope.patch
@@ -0,0 +1,31 @@
+From 35e528018f315798d3bffcb592b32a0d8f5162bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[e-mail]>
+Date: Tue, 27 Aug 2019 19:00:34 +0200
+Subject: [PATCH] shared/but-util: drop trusted annotation from
+ bus_open_system_watch_bind_with_description()
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1746057
+
+This only affects systemd-resolved. bus_open_system_watch_bind_with_description()
+is also used in timesyncd, but it has no methods, only read-only properties, and
+in networkd, but it annotates all methods with SD_BUS_VTABLE_UNPRIVILEGED and does
+polkit checks.
+---
+ src/shared/bus-util.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
+index 6af115e7aa..821339d4ae 100644
+--- a/src/shared/bus-util.c
++++ b/src/shared/bus-util.c
+@@ -1705,10 +1705,6 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri
+         if (r < 0)
+                 return r;
+ 
+-        r = sd_bus_set_trusted(bus, true);
+-        if (r < 0)
+-                return r;
+-
+         r = sd_bus_negotiate_creds(bus, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS);
+         if (r < 0)
+                 return r;
diff --git a/debian/patches/debian/Revert-udev-network-device-renaming-immediately-give.patch b/debian/patches/debian/Revert-udev-network-device-renaming-immediately-give.patch
 new file mode 100644
index 0000000..e8bf17b
--- /dev/null
+++ b/debian/patches/debian/Revert-udev-network-device-renaming-immediately-give.patch
@@ -0,0 +1,89 @@
+From: Michael Biebl <[e-mail]>
+Date: Thu, 18 Jul 2013 01:04:07 +0200
+Subject: Revert "udev: network device renaming - immediately give up if the
+ target name isn't available"
+
+This reverts commit 97595710b77aa162ca5e20da57d0a1ed7355eaad.
+
+We need to keep supporting systems with 75-persistent-net-generator.rules
+generated names for a while after switching to net.ifnames. Re-apply this old
+hack to make the renaming less likely to fail.
+---
+ src/udev/udev-event.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 46 insertions(+), 5 deletions(-)
+
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index 07b7365..f67b295 100644
+--- a/src/udev/udev-event.c
++++ b/src/udev/udev-event.c
+@@ -680,6 +680,7 @@ static int rename_netif(UdevEvent *event) {
+         const char *action, *oldname;
+         char name[IFNAMSIZ];
+         int ifindex, r;
++        int loop;
+ 
+         if (!event->name)
+                 return 0; /* No new name is requested. */
+@@ -705,17 +706,57 @@ static int rename_netif(UdevEvent *event) {
+                 return log_device_error_errno(dev, r, "Failed to get ifindex: %m");
+ 
+         strscpy(name, IFNAMSIZ, event->name);
++
+         r = rtnl_set_link_name(&event->rtnl, ifindex, name);
+-        if (r < 0)
+-                return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", ifindex, oldname, name);
++        if (r >= 0) {
++                r = device_rename(dev, event->name);
++                if (r < 0)
++                        return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name);
++
++                log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name);
++
++                return 1;
++        }
++
++        /* keep trying if the destination interface name already exists */
++        if (r != -EEXIST)
++                goto out;
+ 
+-        r = device_rename(dev, event->name);
++        /* free our own name, another process may wait for us */
++        snprintf(name, IFNAMSIZ, "rename%u", ifindex);
++        r = rtnl_set_link_name(&event->rtnl, ifindex, name);
+         if (r < 0)
+-                return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name);
++                goto out;
+ 
++        /* log temporary name */
+         log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name);
+ 
+-        return 1;
++        /* wait a maximum of 90 seconds for our target to become available */
++        strscpy(name, IFNAMSIZ, event->name);
++        loop = 90 * 20;
++        while (loop--) {
++                const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
++
++                nanosleep(&duration, NULL);
++
++                r = rtnl_set_link_name(&event->rtnl, ifindex, name);
++                if (r >= 0) {
++                        r = device_rename(dev, event->name);
++                        if (r < 0)
++                                return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name);
++
++                        log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name);
++
++                        return 1;
++                }
++                if (r != -EEXIST)
++                        goto out;
++        }
++
++out:
++        if (r < 0)
++                return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", ifindex, oldname, name);
++        return r;
+ }
+ 
+ static int update_devnode(UdevEvent *event) {
diff --git a/debian/patches/series b/debian/patches/series
index 3a69a3a..eaf2648 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,6 +54,7 @@ core-when-we-uninstall-a-job-add-unit-to-dbus-queue.patch
 debian/Use-Debian-specific-config-files.patch
 debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
 debian/Make-run-lock-tmpfs-an-API-fs.patch
+debian/Revert-udev-network-device-renaming-immediately-give.patch
 debian/Add-support-for-TuxOnIce-hibernation.patch
 debian/Re-enable-journal-forwarding-to-syslog.patch
 debian/Don-t-enable-audit-by-default.patch
@@ -149,3 +150,4 @@ ask-password-prevent-buffer-overrow-when-reading-fro.patch
 rdrand-workaround-on-amd.patch
 lp1835581-src-network-networkd-dhcp4.c-set-prefsrc-for-classle.patch
 lp1668771-resolved-switch-cache-option-to-a-tri-state-option-s.patch
+0001-shared-but-util-drop-trusted-annotation-from-bus_ope.patch