From fd989a0bc999d79719408ac28b126d9c9016bcb5 Mon Sep 17 00:00:00 2001

From: Philippe De Swert <philippedeswert@gmail.com>

Date: Wed, 10 Sep 2014 12:20:38 +0300

Subject: [PATCH] bus: avoid using m->kdbus after freeing it

m->kdbus could be freed before it is released. Changing the

order fixes the issue.

Found with Coverity. Fixes: CID#1237798

---

 src/libsystemd/sd-bus/bus-message.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c

index d00455a112..bfb14fcce6 100644

--- a/src/libsystemd/sd-bus/bus-message.c

+++ b/src/libsystemd/sd-bus/bus-message.c

@@ -127,9 +127,6 @@ static void message_free(sd_bus_message *m) {

         message_reset_parts(m);

-        if (m->free_kdbus)

-                free(m->kdbus);

-

         if (m->release_kdbus) {

                 uint64_t off;

@@ -137,6 +134,9 @@ static void message_free(sd_bus_message *m) {

                 ioctl(m->bus->input_fd, KDBUS_CMD_FREE, &off;;

         }

+        if (m->free_kdbus)

+                free(m->kdbus);

+

         sd_bus_unref(m->bus);

         if (m->free_fds) {