Skip to content

Commit 545f144

Browse files
michichgregkh
authored andcommitted
rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
[ Upstream commit 77ef033b687c3e030017c94a29bf6ea3aaaef678 ] IFLA_PHYS_PORT_NAME is a string attribute, so terminate it with \0. Otherwise libnl3 fails to validate netlink messages with this attribute. "ip -detail a" assumes too that the attribute is NUL-terminated when printing it. It often was, due to padding. I noticed this as libvirtd failing to start on a system with sfc driver after upgrading it to Linux 4.11, i.e. when sfc added support for phys_port_name. Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1a12d19 commit 545f144

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/core/rtnetlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev)
10181018
return err;
10191019
}
10201020

1021-
if (nla_put(skb, IFLA_PHYS_PORT_NAME, strlen(name), name))
1021+
if (nla_put_string(skb, IFLA_PHYS_PORT_NAME, name))
10221022
return -EMSGSIZE;
10231023

10241024
return 0;

0 commit comments

Comments
 (0)