chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: do not pass a pointer but a uint64_t address in RECV
[elogind.git]
/
src
/
libsystemd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd-bus/bus-kernel.c
b/src/libsystemd-bus/bus-kernel.c
index 107b2bd69401011df9244ad6183f8e59c75ba9c1..50b28e7281476e46ef114b220636f7de92d5bcbf 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.c
+++ b/
src/libsystemd-bus/bus-kernel.c
@@
-639,19
+639,21
@@
fail:
}
int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) {
}
int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) {
+ uint64_t addr;
struct kdbus_msg *k;
int r;
assert(bus);
assert(m);
struct kdbus_msg *k;
int r;
assert(bus);
assert(m);
- r = ioctl(bus->input_fd, KDBUS_CMD_MSG_RECV, &
k
);
+ r = ioctl(bus->input_fd, KDBUS_CMD_MSG_RECV, &
addr
);
if (r < 0) {
if (errno == EAGAIN)
return 0;
return -errno;
}
if (r < 0) {
if (errno == EAGAIN)
return 0;
return -errno;
}
+ k = UINT64_TO_PTR(addr);
r = bus_kernel_make_message(bus, k, m);
if (r <= 0)
r = bus_kernel_make_message(bus, k, m);
if (r <= 0)