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

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index d00455a1121de100b01e64cb5a61e6c550a47398..bfb14fcce613d409f3fe375381bde3cabb91ac9a 100644 (file)
--- 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);
 
 
         message_reset_parts(m);
 

-        if (m->free_kdbus)
-                free(m->kdbus);
-

         if (m->release_kdbus) {
                 uint64_t off;
 
         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);
         }
 
                 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) {
         sd_bus_unref(m->bus);
 
         if (m->free_fds) {