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

core/loopback-setup: set a timeout for the kernel reply (#6187)

Browse source 
This shouldn't happen, but just in case for any reason the kernel
doesn't answer, it's probably much better to continue.

Follow-up for fb8939274a.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-06-26 03:33:37 -04:00 committed by Lennart Poettering
parent 593022fa37
commit 2d2a815c90
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/loopback-setup.c
View file

@ -26,6 +26,8 @@
#include "missing.h"
#include "netlink-util.h"
#define LOOPBACK_SETUP_TIMEOUT_USEC (5 * USEC_PER_SEC)
struct state {
unsigned n_messages;
int rcode;
@ -61,7 +63,7 @@ static int start_loopback(sd_netlink *rtnl, struct state *s) {
if (r < 0)
return r;
r = sd_netlink_call_async(rtnl, req, start_loopback_handler, s, USEC_INFINITY, NULL);
r = sd_netlink_call_async(rtnl, req, start_loopback_handler, s, LOOPBACK_SETUP_TIMEOUT_USEC, NULL);
if (r < 0)
return r;
@ -201,7 +203,7 @@ int loopback_setup(void) {
return log_error_errno(r, "Failed to enqueue loopback interface start request: %m");
while (state.n_messages > 0) {
r = sd_netlink_wait(rtnl, USEC_INFINITY);
r = sd_netlink_wait(rtnl, LOOPBACK_SETUP_TIMEOUT_USEC);
if (r < 0)
return log_error_errno(r, "Failed to wait for netlink event: %m");