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: return ECHILD as soon as people try to reuse a bus connection across a fork()
[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 5e285c9e528ed669c3904f5a91041261391bd92d..befded70799e07d242acd30b0f13159924138e93 100644
(file)
--- a/
src/libsystemd-bus/bus-socket.c
+++ b/
src/libsystemd-bus/bus-socket.c
@@
-58,7
+58,7
@@
static void iovec_advance(struct iovec iov[], unsigned *idx, size_t size) {
}
}
}
}
-static
void
append_iovec(sd_bus_message *m, const void *p, size_t sz) {
+static
int
append_iovec(sd_bus_message *m, const void *p, size_t sz) {
assert(m);
assert(p);
assert(sz > 0);
assert(m);
assert(p);
assert(sz > 0);
@@
-66,29
+66,55
@@
static void append_iovec(sd_bus_message *m, const void *p, size_t sz) {
m->iovec[m->n_iovec].iov_base = (void*) p;
m->iovec[m->n_iovec].iov_len = sz;
m->n_iovec++;
m->iovec[m->n_iovec].iov_base = (void*) p;
m->iovec[m->n_iovec].iov_len = sz;
m->n_iovec++;
+
+ return 0;
}
}
-static void bus_message_setup_iovec(sd_bus_message *m) {
+static int bus_message_setup_iovec(sd_bus_message *m) {
+ struct bus_body_part *part;
+ unsigned n, i;
+ int r;
+
assert(m);
assert(m->sealed);
if (m->n_iovec > 0)
assert(m);
assert(m->sealed);
if (m->n_iovec > 0)
- return;
+ return
0
;
- a
ppend_iovec(m, m->header, sizeof(*m->header)
);
+ a
ssert(!m->iovec
);
- if (m->fields) {
- append_iovec(m, m->fields, m->header->fields_size);
+ n = 1 + m->n_body_parts;
+ if (n < ELEMENTSOF(m->iovec_fixed))
+ m->iovec = m->iovec_fixed;
+ else {
+ m->iovec = new(struct iovec, n);
+ if (!m->iovec) {
+ r = -ENOMEM;
+ goto fail;
+ }
+ }
- if (m->header->fields_size % 8 != 0) {
- static const uint8_t padding[7] = {};
+ r = append_iovec(m, m->header, BUS_MESSAGE_BODY_BEGIN(m));
+ if (r < 0)
+ goto fail;
- append_iovec(m, padding, 8 - (m->header->fields_size % 8));
- }
+ 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)
+ goto fail;
}
}
- if (m->body)
- append_iovec(m, m->body, m->header->body_size);
+ 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) {
@@
-756,16
+782,19
@@
int bus_socket_write_message(sd_bus *bus, sd_bus_message *m, size_t *idx) {
ssize_t k;
size_t n;
unsigned j;
ssize_t k;
size_t n;
unsigned j;
+ int r;
assert(bus);
assert(m);
assert(idx);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
assert(bus);
assert(m);
assert(idx);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
- if (*idx >=
bus_message_size
(m))
+ if (*idx >=
BUS_MESSAGE_SIZE
(m))
return 0;
return 0;
- bus_message_setup_iovec(m);
+ r = bus_message_setup_iovec(m);
+ if (r < 0)
+ return r;
n = m->n_iovec * sizeof(struct iovec);
iov = alloca(n);
n = m->n_iovec * sizeof(struct iovec);
iov = alloca(n);