rtnetlink: count IFLA_INFO_SLAVE_KIND in if_nlmsg_size

rtnl_link_get_slave_info_data_size counts IFLA_INFO_SLAVE_DATA, but
rtnl_link_slave_info_fill adds both IFLA_INFO_SLAVE_DATA and
IFLA_INFO_SLAVE_KIND.

Fixes: ba7d49b1f0f8 ("rtnetlink: provide api for getting and setting slave info")
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/049843b532e23cde7ddba263c0bbe35ba6f0d26d.1773919462.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 0fe279432d82260a2228c2e11283feb7ee867e06..4a22786142503845516f8b8e5b5b7428af65c441 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -707,11 +707,14 @@ static size_t rtnl_link_get_slave_info_data_size(const struct net_device *dev)
                goto out;
 
        ops = master_dev->rtnl_link_ops;
-       if (!ops || !ops->get_slave_size)
+       if (!ops)
+               goto out;
+       size += nla_total_size(strlen(ops->kind) + 1);  /* IFLA_INFO_SLAVE_KIND */
+       if (!ops->get_slave_size)
                goto out;
        /* IFLA_INFO_SLAVE_DATA + nested data */
-       size = nla_total_size(sizeof(struct nlattr)) +
-              ops->get_slave_size(master_dev, dev);
+       size += nla_total_size(sizeof(struct nlattr)) +
+               ops->get_slave_size(master_dev, dev);
 
 out:
        rcu_read_unlock();