]> git.baikalelectronics.ru Git - kernel.git/commitdiff
rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
authorMichal Schmidt <mschmidt@redhat.com>
Thu, 4 May 2017 14:48:58 +0000 (16:48 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 May 2017 15:23:59 +0000 (11:23 -0400)
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>
net/core/rtnetlink.c

index 6e67315ec36891942a2fedeea794c188236e8052..bcb0f610ee422a12ad6b8ae41763296ba0fa3c6a 100644 (file)
@@ -1054,7 +1054,7 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev)
                return err;
        }
 
-       if (nla_put(skb, IFLA_PHYS_PORT_NAME, strlen(name), name))
+       if (nla_put_string(skb, IFLA_PHYS_PORT_NAME, name))
                return -EMSGSIZE;
 
        return 0;