daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
5d2ee9
From 9c23ceef0a08ffdf4aed7a96ec440e1b110568ac Mon Sep 17 00:00:00 2001
5d2ee9
From: Lennart Poettering <lennart@poettering.net>
5d2ee9
Date: Thu, 17 Jan 2019 18:14:17 +0100
5d2ee9
Subject: [PATCH] sd-bus: reorder bus ref and bus message ref handling
5d2ee9
5d2ee9
Let's always place handling of these references together, so that all
5d2ee9
reference counting during allocation is at a single place.
5d2ee9
5d2ee9
(cherry picked from commit e593b6a87a335267e5f7238b14683b7f840a01a3)
5d2ee9
Related: CVE-2020-1712
5d2ee9
---
5d2ee9
 src/libsystemd/sd-bus/bus-message.c | 5 +++--
5d2ee9
 1 file changed, 3 insertions(+), 2 deletions(-)
5d2ee9
5d2ee9
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
5d2ee9
index 19cb2b9a97..e9cdf46c91 100644
5d2ee9
--- a/src/libsystemd/sd-bus/bus-message.c
5d2ee9
+++ b/src/libsystemd/sd-bus/bus-message.c
5d2ee9
@@ -461,7 +461,6 @@ int bus_message_from_header(
5d2ee9
         if (!m)
5d2ee9
                 return -ENOMEM;
5d2ee9
 
5d2ee9
-        m->n_ref = 1;
5d2ee9
         m->sealed = true;
5d2ee9
         m->header = header;
5d2ee9
         m->header_accessible = header_accessible;
5d2ee9
@@ -515,7 +514,9 @@ int bus_message_from_header(
5d2ee9
                 m->creds.mask |= SD_BUS_CREDS_SELINUX_CONTEXT;
5d2ee9
         }
5d2ee9
 
5d2ee9
+        m->n_ref = 1;
5d2ee9
         m->bus = sd_bus_ref(bus);
5d2ee9
+
5d2ee9
         *ret = TAKE_PTR(m);
5d2ee9
 
5d2ee9
         return 0;
5d2ee9
@@ -588,13 +589,13 @@ _public_ int sd_bus_message_new(
5d2ee9
                 return -ENOMEM;
5d2ee9
 
5d2ee9
         t->n_ref = 1;
5d2ee9
+        t->bus = sd_bus_ref(bus);
5d2ee9
         t->header = (struct bus_header*) ((uint8_t*) t + ALIGN(sizeof(struct sd_bus_message)));
5d2ee9
         t->header->endian = BUS_NATIVE_ENDIAN;
5d2ee9
         t->header->type = type;
5d2ee9
         t->header->version = bus->message_version;
5d2ee9
         t->allow_fds = bus->can_fds || !IN_SET(bus->state, BUS_HELLO, BUS_RUNNING);
5d2ee9
         t->root_container.need_offsets = BUS_MESSAGE_IS_GVARIANT(t);
5d2ee9
-        t->bus = sd_bus_ref(bus);
5d2ee9
 
5d2ee9
         if (bus->allow_interactive_authorization)
5d2ee9
                 t->header->flags |= BUS_MESSAGE_ALLOW_INTERACTIVE_AUTHORIZATION;