summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Chapman <mike@very.puzzling.org>2016-08-18 17:46:21 +1000
committerMichael Chapman <mike@very.puzzling.org>2016-08-18 17:53:53 +1000
commit3bdccf69ca626d6c2f6653044f1f68d9c9da0e42 (patch)
tree236872c318d7b792ebcfc6dfdb184c4e7e503100 /src
parent856e309d7b18cabe18c845bdf57e92958343a9ec (diff)
networkd: do not touch link_messages when expiring routes
link_messages is used during link configuration to advance the link state machine through SETTING_ADDRESSES -> SETTING_ROUTES -> CONFIGURED. If a route expires in the middle of this, it is possible for link_messages to hit zero inside route_expire_callback, rather than in route_handler or address_handler where it would trigger the next step in configuration. Should this happen, the link will not complete configuration, and it may not have its static routes configured. Since route_expire_callback does not need to do anything once the expired route has been removed from the kernel, it is safe to simply not account for the netlink request.
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-route.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 82f9047ff6..5335df53c7 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -441,20 +441,14 @@ static int route_expire_callback(sd_netlink *rtnl, sd_netlink_message *m, void *
assert(m);
assert(link);
assert(link->ifname);
- assert(link->link_messages > 0);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 1;
- link->link_messages--;
-
r = sd_netlink_message_get_errno(m);
if (r < 0 && r != -EEXIST)
log_link_warning_errno(link, r, "could not remove route: %m");
- if (link->link_messages == 0)
- log_link_debug(link, "route removed");
-
return 1;
}
@@ -467,11 +461,8 @@ int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata) {
r = route_remove(route, route->link, route_expire_callback);
if (r < 0)
log_warning_errno(r, "Could not remove route: %m");
- else {
- /* route may not be exist in kernel. If we fail still remove it */
- route->link->link_messages++;
+ else
route_free(route);
- }
return 1;
}