sd-bus: sync kdbus.h (ABI break)

Another slice logic rework in kdbus made KDBUS_ITEM_PAYLOAD_OFF items
relative to the message header again. Catch up with that in sd-bus.

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index b884074d95cd85e14d742684402e1cfe9263af4b..bdc770600bd4de57f62625d52ef8bde89e54aeb9 100644 (file)
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -434,7 +434,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
 
                 case KDBUS_ITEM_PAYLOAD_OFF:
                         if (!h) {
 
                 case KDBUS_ITEM_PAYLOAD_OFF:
                         if (!h) {

-                                h = (struct bus_header *)((uint8_t *)bus->kdbus_buffer + d->vec.offset);
+                                h = (struct bus_header *)((uint8_t *)k + d->vec.offset);

 
                                 if (!bus_header_is_complete(h, d->vec.size))
                                         return -EBADMSG;
 
                                 if (!bus_header_is_complete(h, d->vec.size))
                                         return -EBADMSG;


@@ -526,11 +526,11 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
 
                                 if (idx >= begin_body) {
                                         if (!part->is_zero)
 
                                 if (idx >= begin_body) {
                                         if (!part->is_zero)

-                                                part->data = (uint8_t *)bus->kdbus_buffer + d->vec.offset;
+                                                part->data = (uint8_t *)k + d->vec.offset;

                                         part->size = d->vec.size;
                                 } else {
                                         if (!part->is_zero)
                                         part->size = d->vec.size;
                                 } else {
                                         if (!part->is_zero)

-                                                part->data = (uint8_t *)bus->kdbus_buffer + d->vec.offset + (begin_body - idx);
+                                                part->data = (uint8_t *)k + d->vec.offset + (begin_body - idx);

                                         part->size = d->vec.size - (begin_body - idx);
                                 }
 
                                         part->size = d->vec.size - (begin_body - idx);
                                 }