picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sd-bus: invalidate connection when Hello() fails

Browse source 
Fixes: #13969
This commit is contained in:
Lennart Poettering 2019-11-15 14:23:53 +01:00
parent f0bfae7265
commit 19fa17c7c4
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libsystemd/sd-bus/sd-bus.c
View file

@ -537,29 +537,41 @@ static int hello_callback(sd_bus_message *reply, void *userdata, sd_bus_error *e
assert(IN_SET(bus->state, BUS_HELLO, BUS_CLOSING));
r = sd_bus_message_get_errno(reply);
if (r > 0)
return -r;
if (r > 0) {
r = -r;
goto fail;
}
r = sd_bus_message_read(reply, "s", &s);
if (r < 0)
return r;
goto fail;
if (!service_name_is_valid(s) || s[0] != ':')
return -EBADMSG;
if (!service_name_is_valid(s) || s[0] != ':') {
r = -EBADMSG;
goto fail;
}
r = free_and_strdup(&bus->unique_name, s);
if (r < 0)
return r;
goto fail;
if (bus->state == BUS_HELLO) {
bus_set_state(bus, BUS_RUNNING);
r = synthesize_connected_signal(bus);
if (r < 0)
return r;
goto fail;
}
return 1;
fail:
/* When Hello() failed, let's propagate this in two ways: first we return the error immediately here,
* which is the propagated up towards the event loop. Let's also invalidate the connection, so that
* if the user then calls back into us again we won't wait any longer. */
bus_set_state(bus, BUS_CLOSING);
return r;
}
static int bus_send_hello(sd_bus *bus) {