shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-11 04:58:19 +03:00
Code

sd-bus: if we receive an invalid dbus message, ignore and proceeed

Browse Source 
dbus-daemon might have a slightly different idea of what a valid msg is
than us (for example regarding valid msg and field sizes). Let's hence
try to proceed if we can and thus drop messages rather than fail the
connection if we fail to validate a message.

Hopefully the differences in what is considered valid are not visible
for real-life usecases, but are specific to exploit attempts only.
This commit is contained in:
Lennart Poettering 2019-02-13 16:51:22 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent dc9cced4ac
commit 6d586a1371
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsystemd/sd-bus/bus-socket.c
View File

@ -1072,7 +1072,7 @@ static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
}
static int bus_socket_make_message(sd_bus *bus, size_t size) {
sd_bus_message *t;
sd_bus_message *t = NULL;
void *b;
int r;
@ -1097,7 +1097,9 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
bus->fds, bus->n_fds,
NULL,
&t);
if (r < 0) {
if (r == -EBADMSG)
log_debug_errno(r, "Received invalid message from connection %s, dropping.", strna(bus->description));
else if (r < 0) {
free(b);
return r;
}
@ -1108,7 +1110,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
bus->fds = NULL;
bus->n_fds = 0;
bus->rqueue[bus->rqueue_size++] = t;
if (t)
bus->rqueue[bus->rqueue_size++] = t;
return 1;
}