SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network/routing-policy-rule: use address family of existing rule when judging if existing rule can be updated

Browse Source 
Otherwise, the other RoutingPolicyRule object may not have a valid
address family yet, and the existing rule may be wrongly handled as
that it is not requested by any interface, and it may be removed.

Follow-up for 727235006a.
Fixes #34068.
This commit is contained in:
Yu Watanabe
2024-08-22 04:11:52 +09:00
parent a3e4dc6762
commit 04d10fdb1d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-routing-policy-rule.c
+5 -3
View File
@@ -351,11 +351,13 @@ static bool routing_policy_rule_equal(const RoutingPolicyRule *a, const RoutingP
return routing_policy_rule_compare_func_full(a, b, /* all = */ false) == 0;
}
static bool routing_policy_rule_can_update(const RoutingPolicyRule *existing, const RoutingPolicyRule *requesting, int family) {
static bool routing_policy_rule_can_update(const RoutingPolicyRule *existing, const RoutingPolicyRule *requesting) {
assert(existing);
assert(IN_SET(existing->family, AF_INET, AF_INET6));
assert(requesting);
assert(IN_SET(requesting->family, AF_INET, AF_INET6) || requesting->address_family == ADDRESS_FAMILY_YES);
if (!routing_policy_rule_equal(existing, requesting, family, existing->priority))
if (!routing_policy_rule_equal(existing, requesting, existing->family, existing->priority))
return false;
/* These flags cannot be updated. */
@@ -791,7 +793,7 @@ static void manager_unmark_routing_policy_rule(Manager *m, const RoutingPolicyRu
if (routing_policy_rule_get(m, rule, family, &existing) < 0)
return;
if (!routing_policy_rule_can_update(existing, rule, rule->family))
if (!routing_policy_rule_can_update(existing, rule))
return;
routing_policy_rule_unmark(existing);