Commit 36c2e31a authored by Eyal Birger's avatar Eyal Birger Committed by Jakub Kicinski
Browse files

net: geneve: add missing netlink policy and size for IFLA_GENEVE_INNER_PROTO_INHERIT 



Add missing netlink attribute policy and size calculation.
Also enable strict validation from this new attribute onwards.

Fixes: 435fe1c0 ("net: geneve: support IPv4/IPv6 as inner protocol")
Signed-off-by: default avatarEyal Birger <eyal.birger@gmail.com>
Link: https://lore.kernel.org/r/20220322043954.3042468-1-eyal.birger@gmail.com


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

drivers/net/geneve.c

+3 −0
Original line number Diff line number Diff line
@@ -1262,6 +1262,7 @@ static void geneve_setup(struct net_device *dev) 
}



static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {

	[IFLA_GENEVE_UNSPEC]		= { .strict_start_type = IFLA_GENEVE_INNER_PROTO_INHERIT },

	[IFLA_GENEVE_ID]		= { .type = NLA_U32 },

	[IFLA_GENEVE_REMOTE]		= { .len = sizeof_field(struct iphdr, daddr) },

	[IFLA_GENEVE_REMOTE6]		= { .len = sizeof(struct in6_addr) },
@@ -1275,6 +1276,7 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = { 
	[IFLA_GENEVE_UDP_ZERO_CSUM6_RX]	= { .type = NLA_U8 },

	[IFLA_GENEVE_TTL_INHERIT]	= { .type = NLA_U8 },

	[IFLA_GENEVE_DF]		= { .type = NLA_U8 },

	[IFLA_GENEVE_INNER_PROTO_INHERIT]	= { .type = NLA_FLAG },

};



static int geneve_validate(struct nlattr *tb[], struct nlattr *data[],
@@ -1780,6 +1782,7 @@ static size_t geneve_get_size(const struct net_device *dev) 
		nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_TX */

		nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_RX */

		nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TTL_INHERIT */

		nla_total_size(0) +	 /* IFLA_GENEVE_INNER_PROTO_INHERIT */

		0;

}