X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=76a27ec3c7bc3c496e98b12ce26e43d2d278f80f;hb=821e0756c62d705252ab13d24af941578c0b9642;hp=932bf226c58509a9e07963873d22c4fcf94de66f;hpb=6d6f4904aaa5047370949093cd63d0fc2a4a83b8;p=elogind.git diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 932bf226c..76a27ec3c 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -118,6 +118,7 @@ static void bus_reset_queues(sd_bus *b) { free(b->wqueue); b->rqueue = b->wqueue = NULL; + b->rqueue_allocated = b->wqueue_allocated = 0; b->rqueue_size = b->wqueue_size = 0; } @@ -195,8 +196,7 @@ _public_ int sd_bus_new(sd_bus **ret) { /* We guarantee that wqueue always has space for at least one * entry */ - r->wqueue = new(sd_bus_message*, 1); - if (!r->wqueue) { + if (!GREEDY_REALLOC(r->wqueue, r->wqueue_allocated, 1)) { free(r); return -ENOMEM; } @@ -397,7 +397,7 @@ int bus_start_running(sd_bus *bus) { } static int parse_address_key(const char **p, const char *key, char **value) { - size_t l, n = 0; + size_t l, n = 0, allocated = 0; const char *a; char *r = NULL; @@ -421,7 +421,7 @@ static int parse_address_key(const char **p, const char *key, char **value) { a = *p; while (*a != ';' && *a != ',' && *a != 0) { - char c, *t; + char c; if (*a == '%') { int x, y; @@ -445,13 +445,9 @@ static int parse_address_key(const char **p, const char *key, char **value) { a++; } - t = realloc(r, n + 2); - if (!t) { - free(r); + if (!GREEDY_REALLOC(r, allocated, n + 2)) return -ENOMEM; - } - r = t; r[n++] = c; } @@ -614,6 +610,7 @@ static int parse_exec_address(sd_bus *b, const char **p, char **guid) { char *path = NULL; unsigned n_argv = 0, j; char **argv = NULL; + size_t allocated = 0; int r; assert(b); @@ -647,17 +644,11 @@ static int parse_exec_address(sd_bus *b, const char **p, char **guid) { (*p) ++; if (ul >= n_argv) { - char **x; - - x = realloc(argv, sizeof(char*) * (ul + 2)); - if (!x) { + if (!GREEDY_REALLOC0(argv, allocated, ul + 2)) { r = -ENOMEM; goto fail; } - memset(x + n_argv, 0, sizeof(char*) * (ul - n_argv + 2)); - - argv = x; n_argv = ul + 1; } @@ -740,7 +731,7 @@ static int parse_kernel_address(sd_bus *b, const char **p, char **guid) { return 0; } -static int parse_container_address(sd_bus *b, const char **p, char **guid) { +static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) { _cleanup_free_ char *machine = NULL; int r; @@ -782,6 +773,49 @@ static int parse_container_address(sd_bus *b, const char **p, char **guid) { return 0; } +static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *machine = NULL; + int r; + + assert(b); + assert(p); + assert(*p); + assert(guid); + + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; + + r = parse_address_key(p, "machine", &machine); + if (r < 0) + return r; + else if (r > 0) + continue; + + skip_address_key(p); + } + + if (!machine) + return -EINVAL; + + if (!filename_is_safe(machine)) + return -EINVAL; + + free(b->machine); + b->machine = machine; + machine = NULL; + + free(b->kernel); + b->kernel = strdup("/dev/kdbus/0-system/bus"); + if (!b->kernel) + return -ENOMEM; + + return 0; +} + static void bus_reset_parsed_address(sd_bus *b) { assert(b); @@ -855,10 +889,18 @@ static int bus_parse_next_address(sd_bus *b) { return r; break; - } else if (startswith(a, "x-container:")) { + } else if (startswith(a, "x-container-unix:")) { + + a += 17; + r = parse_container_unix_address(b, &a, &guid); + if (r < 0) + return r; + + break; + } else if (startswith(a, "x-container-kernel:")) { - a += 12; - r = parse_container_address(b, &a, &guid); + a += 19; + r = parse_container_kernel_address(b, &a, &guid); if (r < 0) return r; @@ -892,10 +934,12 @@ static int bus_start_address(sd_bus *b) { if (b->exec_path) r = bus_socket_exec(b); + else if (b->machine && b->kernel) + r = bus_container_connect_kernel(b); + else if (b->machine && b->sockaddr.sa.sa_family != AF_UNSPEC) + r = bus_container_connect_socket(b); else if (b->kernel) r = bus_kernel_connect(b); - else if (b->machine) - r = bus_container_connect(b); else if (b->sockaddr.sa.sa_family != AF_UNSPEC) r = bus_socket_connect(b); else @@ -1144,9 +1188,9 @@ _public_ int sd_bus_open_system_container(const char *machine, sd_bus **ret) { return -ENOMEM; #ifdef ENABLE_KDBUS - p = strjoin("kernel:path=/dev/kdbus/ns/machine-", e, "/0-system/bus;x-container:machine=", e, NULL); + p = strjoin("x-container-kernel:machine=", e, ";x-container-unix:machine=", e, NULL); #else - p = strjoin("x-container:machine=", e, NULL); + p = strjoin("x-container-unix:machine=", e, NULL); #endif if (!p) return -ENOMEM; @@ -1369,24 +1413,14 @@ static int bus_read_message(sd_bus *bus) { } int bus_rqueue_make_room(sd_bus *bus) { - sd_bus_message **q; - unsigned x; - - x = bus->rqueue_size + 1; - - if (bus->rqueue_allocated >= x) - return 0; + assert(bus); - if (x > BUS_RQUEUE_MAX) + if (bus->rqueue_size >= BUS_RQUEUE_MAX) return -ENOBUFS; - q = realloc(bus->rqueue, x * sizeof(sd_bus_message*)); - if (!q) + if (!GREEDY_REALLOC(bus->rqueue, bus->rqueue_allocated, bus->rqueue_size + 1)) return -ENOMEM; - bus->rqueue = q; - bus->rqueue_allocated = x; - return 0; } @@ -1468,19 +1502,15 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { bus->windex = idx; } } else { - sd_bus_message **q; - /* Just append it to the queue. */ if (bus->wqueue_size >= BUS_WQUEUE_MAX) return -ENOBUFS; - q = realloc(bus->wqueue, sizeof(sd_bus_message*) * (bus->wqueue_size + 1)); - if (!q) + if (!GREEDY_REALLOC(bus->wqueue, bus->wqueue_allocated, bus->wqueue_size + 1)) return -ENOMEM; - bus->wqueue = q; - q[bus->wqueue_size ++] = sd_bus_message_ref(m); + bus->wqueue[bus->wqueue_size ++] = sd_bus_message_ref(m); } if (serial)