chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpt-auto-generator: skip nonexistent devices
[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 4a07869157f9fb4d6b581c3f33a247ed5095b578..0c4b6af447297fbe8f1e348f096df36d879f37d9 100644
(file)
--- a/
src/libsystemd-bus/bus-socket.c
+++ b/
src/libsystemd-bus/bus-socket.c
@@
-38,6
+38,8
@@
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-internal.h"
#include "bus-message.h"
+#define SNDBUF_SIZE (8*1024*1024)
+
static void iovec_advance(struct iovec iov[], unsigned *idx, size_t size) {
while (size > 0) {
static void iovec_advance(struct iovec iov[], unsigned *idx, size_t size) {
while (size > 0) {
@@
-83,34
+85,38
@@
static int bus_message_setup_iovec(sd_bus_message *m) {
assert(!m->iovec);
assert(!m->iovec);
- n = 1 +
!!m->fields +
m->n_body_parts;
+ 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 (n < ELEMENTSOF(m->iovec_fixed))
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,
sizeof(*m->header
));
+ r = append_iovec(m, m->header,
BUS_MESSAGE_BODY_BEGIN(m
));
if (r < 0)
if (r < 0)
-
return r
;
+
goto fail
;
-
if (m->fields)
{
- r =
append_iovec(m, m->fields, ALIGN8(m->header->fields_size)
);
+
MESSAGE_FOREACH_PART(part, i, m)
{
+ r =
bus_body_part_map(part
);
if (r < 0)
if (r < 0)
- return r;
- }
+ goto fail;
- for (i = 0, part = &m->body; i < m->n_body_parts; i++, part = part->next) {
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) {
@@
-177,7
+183,7
@@
static int bus_socket_auth_verify_client(sd_bus *b) {
if (!e)
return 0;
if (!e)
return 0;
- if (b->
negotiate_fds
) {
+ if (b->
hello_flags & KDBUS_HELLO_ACCEPT_FD
) {
f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2);
if (!f)
return 0;
f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2);
if (!f)
return 0;
@@
-460,7
+466,7
@@
static int bus_socket_auth_verify_server(sd_bus *b) {
r = bus_socket_auth_write_ok(b);
}
} else if (line_equals(line, l, "NEGOTIATE_UNIX_FD")) {
r = bus_socket_auth_write_ok(b);
}
} else if (line_equals(line, l, "NEGOTIATE_UNIX_FD")) {
- if (b->auth == _BUS_AUTH_INVALID || !
b->negotiate_fds
)
+ if (b->auth == _BUS_AUTH_INVALID || !
(b->hello_flags & KDBUS_HELLO_ACCEPT_FD)
)
r = bus_socket_auth_write(b, "ERROR\r\n");
else {
b->can_fds = true;
r = bus_socket_auth_write(b, "ERROR\r\n");
else {
b->can_fds = true;
@@
-596,9
+602,8
@@
static int bus_socket_read_auth(sd_bus *b) {
return 1;
}
return 1;
}
-
static int
bus_socket_setup(sd_bus *b) {
+
void
bus_socket_setup(sd_bus *b) {
int enable;
int enable;
- socklen_t l;
assert(b);
assert(b);
@@
-606,18
+611,24
@@
static int bus_socket_setup(sd_bus *b) {
* socket, just in case. */
enable = !b->bus_client;
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable));
* socket, just in case. */
enable = !b->bus_client;
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable));
+
+ enable = !b->bus_client && (b->attach_flags & KDBUS_ATTACH_SECLABEL);
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSSEC, &enable, sizeof(enable));
setsockopt(b->input_fd, SOL_SOCKET, SO_PASSSEC, &enable, sizeof(enable));
- /* Increase the buffers to
a
MB */
- fd_inc_rcvbuf(b->input_fd,
1024*1024
);
- fd_inc_sndbuf(b->output_fd,
1024*1024
);
+ /* Increase the buffers to
8
MB */
+ fd_inc_rcvbuf(b->input_fd,
SNDBUF_SIZE
);
+ fd_inc_sndbuf(b->output_fd,
SNDBUF_SIZE
);
- /* Get the peer for socketpair() sockets */
-
l = sizeof(b->ucred)
;
- if (getsockopt(b->input_fd, SOL_SOCKET, SO_PEERCRED, &b->ucred, &l) >= 0 && l >= sizeof(b->ucred))
- b->ucred_valid = b->ucred.pid > 0;
+ b->is_kernel = false;
+
b->message_version = 1
;
+ b->message_endian = 0;
+}
- return 0;
+static void bus_get_peercred(sd_bus *b) {
+ assert(b);
+
+ /* Get the peer for socketpair() sockets */
+ b->ucred_valid = getpeercred(b->input_fd, &b->ucred) >= 0;
}
static int bus_socket_start_auth_client(sd_bus *b) {
}
static int bus_socket_start_auth_client(sd_bus *b) {
@@
-647,7
+658,7
@@
static int bus_socket_start_auth_client(sd_bus *b) {
if (!b->auth_buffer)
return -ENOMEM;
if (!b->auth_buffer)
return -ENOMEM;
- if (b->
negotiate_fds
)
+ if (b->
hello_flags & KDBUS_HELLO_ACCEPT_FD
)
auth_suffix = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n";
else
auth_suffix = "\r\nBEGIN\r\n";
auth_suffix = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n";
else
auth_suffix = "\r\nBEGIN\r\n";
@@
-662,18
+673,20
@@
static int bus_socket_start_auth_client(sd_bus *b) {
return bus_socket_write_auth(b);
}
return bus_socket_write_auth(b);
}
-
static
int bus_socket_start_auth(sd_bus *b) {
+int bus_socket_start_auth(sd_bus *b) {
assert(b);
assert(b);
+ bus_get_peercred(b);
+
b->state = BUS_AUTHENTICATING;
b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT;
if (sd_is_socket(b->input_fd, AF_UNIX, 0, 0) <= 0)
b->state = BUS_AUTHENTICATING;
b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT;
if (sd_is_socket(b->input_fd, AF_UNIX, 0, 0) <= 0)
- b->
negotiate_fds = false
;
+ b->
hello_flags &= ~KDBUS_HELLO_ACCEPT_FD
;
if (b->output_fd != b->input_fd)
if (sd_is_socket(b->output_fd, AF_UNIX, 0, 0) <= 0)
if (b->output_fd != b->input_fd)
if (sd_is_socket(b->output_fd, AF_UNIX, 0, 0) <= 0)
- b->
negotiate_fds = false
;
+ b->
hello_flags &= ~KDBUS_HELLO_ACCEPT_FD
;
if (b->is_server)
return bus_socket_read_auth(b);
if (b->is_server)
return bus_socket_read_auth(b);
@@
-695,9
+708,7
@@
int bus_socket_connect(sd_bus *b) {
b->output_fd = b->input_fd;
b->output_fd = b->input_fd;
- r = bus_socket_setup(b);
- if (r < 0)
- return r;
+ bus_socket_setup(b);
r = connect(b->input_fd, &b->sockaddr.sa, b->sockaddr_size);
if (r < 0) {
r = connect(b->input_fd, &b->sockaddr.sa, b->sockaddr_size);
if (r < 0) {
@@
-759,16
+770,15
@@
int bus_socket_exec(sd_bus *b) {
close_nointr_nofail(s[1]);
b->output_fd = b->input_fd = s[0];
close_nointr_nofail(s[1]);
b->output_fd = b->input_fd = s[0];
+ bus_socket_setup(b);
+
return bus_socket_start_auth(b);
}
int bus_socket_take_fd(sd_bus *b) {
return bus_socket_start_auth(b);
}
int bus_socket_take_fd(sd_bus *b) {
- int r;
assert(b);
assert(b);
- r = bus_socket_setup(b);
- if (r < 0)
- return r;
+ bus_socket_setup(b);
return bus_socket_start_auth(b);
}
return bus_socket_start_auth(b);
}
@@
-868,10
+878,10
@@
static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
b = ((const uint32_t*) bus->rbuffer)[3];
e = ((const uint8_t*) bus->rbuffer)[0];
b = ((const uint32_t*) bus->rbuffer)[3];
e = ((const uint8_t*) bus->rbuffer)[0];
- if (e ==
SD_
BUS_LITTLE_ENDIAN) {
+ if (e == BUS_LITTLE_ENDIAN) {
a = le32toh(a);
b = le32toh(b);
a = le32toh(a);
b = le32toh(b);
- } else if (e ==
SD_
BUS_BIG_ENDIAN) {
+ } else if (e == BUS_BIG_ENDIAN) {
a = be32toh(a);
b = be32toh(b);
} else
a = be32toh(a);
b = be32toh(b);
} else
@@
-885,16
+895,19
@@
static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
return 0;
}
return 0;
}
-static int bus_socket_make_message(sd_bus *bus, size_t size
, sd_bus_message **m
) {
+static int bus_socket_make_message(sd_bus *bus, size_t size) {
sd_bus_message *t;
void *b;
int r;
assert(bus);
sd_bus_message *t;
void *b;
int r;
assert(bus);
- assert(m);
assert(bus->rbuffer_size >= size);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
assert(bus->rbuffer_size >= size);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
+ r = bus_rqueue_make_room(bus);
+ if (r < 0)
+ return r;
+
if (bus->rbuffer_size > size) {
b = memdup((const uint8_t*) bus->rbuffer + size,
bus->rbuffer_size - size);
if (bus->rbuffer_size > size) {
b = memdup((const uint8_t*) bus->rbuffer + size,
bus->rbuffer_size - size);
@@
-903,10
+916,11
@@
static int bus_socket_make_message(sd_bus *bus, size_t size, sd_bus_message **m)
} else
b = NULL;
} else
b = NULL;
- r = bus_message_from_malloc(bus->rbuffer, size,
+ r = bus_message_from_malloc(bus,
+ bus->rbuffer, size,
bus->fds, bus->n_fds,
bus->fds, bus->n_fds,
- bus->ucred_valid ? &bus->ucred : NULL,
- bus->label[0] ? bus->label : NULL,
+
!bus->bus_client &&
bus->ucred_valid ? &bus->ucred : NULL,
+
!bus->bus_client &&
bus->label[0] ? bus->label : NULL,
&t);
if (r < 0) {
free(b);
&t);
if (r < 0) {
free(b);
@@
-919,11
+933,12
@@
static int bus_socket_make_message(sd_bus *bus, size_t size, sd_bus_message **m)
bus->fds = NULL;
bus->n_fds = 0;
bus->fds = NULL;
bus->n_fds = 0;
- *m = t;
+ bus->rqueue[bus->rqueue_size++] = t;
+
return 1;
}
return 1;
}
-int bus_socket_read_message(sd_bus *bus
, sd_bus_message **m
) {
+int bus_socket_read_message(sd_bus *bus) {
struct msghdr mh;
struct iovec iov;
ssize_t k;
struct msghdr mh;
struct iovec iov;
ssize_t k;
@@
-940,7
+955,6
@@
int bus_socket_read_message(sd_bus *bus, sd_bus_message **m) {
bool handle_cmsg = false;
assert(bus);
bool handle_cmsg = false;
assert(bus);
- assert(m);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
r = bus_socket_read_message_need(bus, &need);
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
r = bus_socket_read_message_need(bus, &need);
@@
-948,7
+962,7
@@
int bus_socket_read_message(sd_bus *bus, sd_bus_message **m) {
return r;
if (bus->rbuffer_size >= need)
return r;
if (bus->rbuffer_size >= need)
- return bus_socket_make_message(bus, need
, m
);
+ return bus_socket_make_message(bus, need);
b = realloc(bus->rbuffer, need);
if (!b)
b = realloc(bus->rbuffer, need);
if (!b)
@@
-1038,7
+1052,7
@@
int bus_socket_read_message(sd_bus *bus, sd_bus_message **m) {
return r;
if (bus->rbuffer_size >= need)
return r;
if (bus->rbuffer_size >= need)
- return bus_socket_make_message(bus, need
, m
);
+ return bus_socket_make_message(bus, need);
return 1;
}
return 1;
}