From b0ab85a2e4b9fe631f407c59617e89d4627ab7f7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 11 Jun 2019 23:33:22 +0900 Subject: [PATCH] network: ignore requested ipv6 fdb entry when ipv6 is disabled by sysctl --- src/network/networkd-fdb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index 4ae511fc7ae..4cacc441061 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -124,6 +124,11 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) { assert(link->manager); assert(fdb_entry); + if (fdb_entry->family == AF_INET6 && manager_sysctl_ipv6_enabled(link->manager) == 0) { + log_link_warning(link, "An IPv6 fdb entry is requested, but IPv6 is disabled by sysctl, ignoring."); + return 0; + } + /* create new RTM message */ r = sd_rtnl_message_new_neigh(link->manager->rtnl, &req, RTM_NEWNEIGH, link->ifindex, PF_BRIDGE); if (r < 0) @@ -169,7 +174,7 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) { link_ref(link); - return 0; + return 1; } /* remove and FDB entry. */ -- 2.39.2