From: Laine Stump Date: Wed, 16 Oct 2019 18:06:54 +0000 (-0400) Subject: util: allow sending mac addr to virNetNewLink without ifindex X-Git-Tag: v5.10.0-rc1~389 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b596d6c106cd87d6d452c5dd4ad923a034544fbf;p=thirdparty%2Flibvirt.git util: allow sending mac addr to virNetNewLink without ifindex Although until now, any use of the extra_args argument (a pointer to a struct containing extra attributes to add the the RTM_NEWLINK message) would always have the ifindex and mac set, so the code could assume it was safe to add both to the message if extra_args != NULL. There is now a use for setting a MAC address in the RTM_NEWLINK without setting the ifindex, so we should check each of these separately. Signed-off-by: Laine Stump Reviewed-by: Jiri Denemark --- diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 0d91503714..2542703092 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -541,9 +541,14 @@ virNetlinkNewLink(const char *ifname, NETLINK_MSG_NEST_END(nl_msg, linkinfo); if (extra_args) { - NETLINK_MSG_PUT(nl_msg, IFLA_LINK, + if (extra_args->ifindex) { + NETLINK_MSG_PUT(nl_msg, IFLA_LINK, sizeof(uint32_t), extra_args->ifindex); - NETLINK_MSG_PUT(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, extra_args->mac); + } + if (extra_args->mac) { + NETLINK_MSG_PUT(nl_msg, IFLA_ADDRESS, + VIR_MAC_BUFLEN, extra_args->mac); + } } if (virNetlinkCommand(nl_msg, &resp, &buflen, 0, 0, NETLINK_ROUTE, 0) < 0)