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: send memfds as payload only on directed messages and for large parts
[elogind.git]
/
src
/
libsystemd-bus
/
bus-socket.c
diff --git
a/src/libsystemd-bus/bus-socket.c
b/src/libsystemd-bus/bus-socket.c
index 4635da4b9ea436d98ee6735fb7cc5be5a12f80a4..befded70799e07d242acd30b0f13159924138e93 100644
(file)
--- a/
src/libsystemd-bus/bus-socket.c
+++ b/
src/libsystemd-bus/bus-socket.c
@@
-88,23
+88,33
@@
static int bus_message_setup_iovec(sd_bus_message *m) {
m->iovec = m->iovec_fixed;
else {
m->iovec = new(struct iovec, n);
m->iovec = m->iovec_fixed;
else {
m->iovec = new(struct iovec, n);
- if (!m->iovec)
- return -ENOMEM;
+ if (!m->iovec) {
+ r = -ENOMEM;
+ goto fail;
+ }
}
r = append_iovec(m, m->header, BUS_MESSAGE_BODY_BEGIN(m));
if (r < 0)
}
r = append_iovec(m, m->header, BUS_MESSAGE_BODY_BEGIN(m));
if (r < 0)
-
return r
;
+
goto fail
;
MESSAGE_FOREACH_PART(part, i, m) {
MESSAGE_FOREACH_PART(part, i, m) {
+ r = bus_body_part_map(part);
+ if (r < 0)
+ goto fail;
+
r = append_iovec(m, part->data, part->size);
if (r < 0)
r = append_iovec(m, part->data, part->size);
if (r < 0)
-
return r
;
+
goto fail
;
}
assert(n == m->n_iovec);
return 0;
}
assert(n == m->n_iovec);
return 0;
+
+fail:
+ m->poisoned = true;
+ return r;
}
bool bus_socket_auth_needs_write(sd_bus *b) {
}
bool bus_socket_auth_needs_write(sd_bus *b) {