shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

networkd: fix link_up() (#12505)

Browse Source 
Fillup IFLA_INET6_ADDR_GEN_MODE while we do link_up.

Fixes the following error:
```
dummy-test: Could not bring up interface: Invalid argument
```

After reading the kernel code when we do a link up
```
net/core/rtnetlink.c
IFLA_AF_SPEC
 af_ops->set_link_af(dev, af);
  inet6_set_link_af
   if (tb[IFLA_INET6_ADDR_GEN_MODE])
             Here it looks for IFLA_INET6_ADDR_GEN_MODE
```
Since link up we didn't filling up that it's failing.

Closes #12504.
This commit is contained in:
Susant Sahani 2019-05-09 07:35:35 +05:30 committed by Yu Watanabe
parent 180f1e3359
commit 4eb086a387
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/networkd-link.c
View File

@ -2031,6 +2031,8 @@ static int link_up(Link *link) {
} }
if (link_ipv6_enabled(link)) { if (link_ipv6_enabled(link)) {
uint8_t ipv6ll_mode;
r = sd_netlink_message_open_container(req, IFLA_AF_SPEC); r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m"); return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
@ -2046,6 +2048,19 @@ static int link_up(Link *link) {
return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m"); return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m");
} }
if (!link_ipv6ll_enabled(link))
ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0)
/* The file may not exist. And event if it exists, when stable_secret is unset,
* reading the file fails with EIO. */
ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
else
ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
if (r < 0)
return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
r = sd_netlink_message_close_container(req); r = sd_netlink_message_close_container(req);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m"); return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");