Commit 025331df authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

rtnl: don't account unused struct ifla_port_vsi in rtnl_port_size 



When allocating rtnl dump messages, struct ifla_port_vsi is never dumped,
so we can save header plus payload in rtnl_port_size(). Infact, attribute
IFLA_PORT_VSI_TYPE and struct ifla_port_vsi are not used anywhere in
the kernel. We only need to keep the nla policy should applications in
user space be filling this out. Same NLA_BINARY issue exists as was fixed
in 364d5716 ("rtnetlink: ifla_vf_policy: fix misuses of NLA_BINARY")
and others, but then again IFLA_PORT_VSI_TYPE is not used anywhere, so
just add a comment that it's unused.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99f18f1d

net/core/rtnetlink.c

+7 −4
Original line number Diff line number Diff line
@@ -876,8 +876,6 @@ static size_t rtnl_port_size(const struct net_device *dev, 
{

	size_t port_size = nla_total_size(4)		/* PORT_VF */

		+ nla_total_size(PORT_PROFILE_MAX)	/* PORT_PROFILE */

		+ nla_total_size(sizeof(struct ifla_port_vsi))

							/* PORT_VSI_TYPE */

		+ nla_total_size(PORT_UUID_MAX)		/* PORT_INSTANCE_UUID */

		+ nla_total_size(PORT_UUID_MAX)		/* PORT_HOST_UUID */

		+ nla_total_size(1)			/* PROT_VDP_REQUEST */
@@ -1491,14 +1489,19 @@ static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = { 
	[IFLA_PORT_VF]		= { .type = NLA_U32 },

	[IFLA_PORT_PROFILE]	= { .type = NLA_STRING,

				    .len = PORT_PROFILE_MAX },

	[IFLA_PORT_VSI_TYPE]	= { .type = NLA_BINARY,

				    .len = sizeof(struct ifla_port_vsi)},

	[IFLA_PORT_INSTANCE_UUID] = { .type = NLA_BINARY,

				      .len = PORT_UUID_MAX },

	[IFLA_PORT_HOST_UUID]	= { .type = NLA_STRING,

				    .len = PORT_UUID_MAX },

	[IFLA_PORT_REQUEST]	= { .type = NLA_U8, },

	[IFLA_PORT_RESPONSE]	= { .type = NLA_U16, },



	/* Unused, but we need to keep it here since user space could

	 * fill it. It's also broken with regard to NLA_BINARY use in

	 * combination with structs.

	 */

	[IFLA_PORT_VSI_TYPE]	= { .type = NLA_BINARY,

				    .len = sizeof(struct ifla_port_vsi) },

};



static const struct nla_policy ifla_xdp_policy[IFLA_XDP_MAX + 1] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE