diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2017-05-04 10:48:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-04 11:23:59 -0400 |
commit | 77ef033b687c3e030017c94a29bf6ea3aaaef678 (patch) | |
tree | 7cbda1d9da4a351e5ec1924c6ffabc7883599329 | |
parent | 2be0f2644598ee4b8ea0ed6a32913e1ce0212c9c (diff) |
rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
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>
-rw-r--r-- | net/core/rtnetlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 6e67315ec368..bcb0f610ee42 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -1054,7 +1054,7 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev) | |||
1054 | return err; | 1054 | return err; |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | if (nla_put(skb, IFLA_PHYS_PORT_NAME, strlen(name), name)) | 1057 | if (nla_put_string(skb, IFLA_PHYS_PORT_NAME, name)) |
1058 | return -EMSGSIZE; | 1058 | return -EMSGSIZE; |
1059 | 1059 | ||
1060 | return 0; | 1060 | return 0; |