[systemd-commits] src/libsystemd

Daniel Mack zonque at kemper.freedesktop.org
Tue Oct 7 03:03:10 PDT 2014


 src/libsystemd/sd-bus/bus-message.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 53e9dbcdfbae355aae8edb79d49e50a0ec3912d5
Author: Daniel Mack <daniel at zonque.org>
Date:   Tue Oct 7 12:02:04 2014 +0200

    sd-bus: fix KDBUS_CMD_FREE user
    
    Fix a user of the KDBUS_CMD_FREE ioctl that was missed in the transition.

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 400ba30..c7cb2e6 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -128,10 +128,11 @@ static void message_free(sd_bus_message *m) {
         message_reset_parts(m);
 
         if (m->release_kdbus) {
-                uint64_t off _alignas_(8);
+                struct kdbus_cmd_free cmd_free;
 
-                off = (uint8_t *)m->kdbus - (uint8_t *)m->bus->kdbus_buffer;
-                ioctl(m->bus->input_fd, KDBUS_CMD_FREE, &off);
+                cmd_free.flags = 0;
+                cmd_free.offset = (uint8_t *)m->kdbus - (uint8_t *)m->bus->kdbus_buffer;
+                (void) ioctl(m->bus->input_fd, KDBUS_CMD_FREE, &cmd_free);
         }
 
         if (m->free_kdbus)



More information about the systemd-commits mailing list