Commit ee00a125 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Jakub Kicinski
Browse files

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: ba7d49b1 ("rtnetlink: provide api for getting and setting slave info")
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/049843b532e23cde7ddba263c0bbe35ba6f0d26d.1773919462.git.sd@queasysnail.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 52501989

net/core/rtnetlink.c

+6 −3
Original line number Diff line number Diff line
@@ -707,10 +707,13 @@ 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)) +

	size += nla_total_size(sizeof(struct nlattr)) +

		ops->get_slave_size(master_dev, dev);



out: