Skip to content

Commit 901d21f

Browse files
committed
net: geneve: add missing netlink policy and size for IFLA_GENEVE_INNER_PROTO_INHERIT
jira LE-1733 bugfix-pre geneve_fixes commit 36c2e31 Add missing netlink attribute policy and size calculation. Also enable strict validation from this new attribute onwards. Fixes: 435fe1c ("net: geneve: support IPv4/IPv6 as inner protocol") Signed-off-by: Eyal Birger <eyal.birger@gmail.com> Link: https://lore.kernel.org/r/20220322043954.3042468-1-eyal.birger@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit 36c2e31) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent d0619cb commit 901d21f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/net/geneve.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,7 @@ static void geneve_setup(struct net_device *dev)
12721272
}
12731273

12741274
static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {
1275+
[IFLA_GENEVE_UNSPEC] = { .strict_start_type = IFLA_GENEVE_INNER_PROTO_INHERIT },
12751276
[IFLA_GENEVE_ID] = { .type = NLA_U32 },
12761277
[IFLA_GENEVE_REMOTE] = { .len = sizeof_field(struct iphdr, daddr) },
12771278
[IFLA_GENEVE_REMOTE6] = { .len = sizeof(struct in6_addr) },
@@ -1285,6 +1286,7 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {
12851286
[IFLA_GENEVE_UDP_ZERO_CSUM6_RX] = { .type = NLA_U8 },
12861287
[IFLA_GENEVE_TTL_INHERIT] = { .type = NLA_U8 },
12871288
[IFLA_GENEVE_DF] = { .type = NLA_U8 },
1289+
[IFLA_GENEVE_INNER_PROTO_INHERIT] = { .type = NLA_FLAG },
12881290
};
12891291

12901292
static int geneve_validate(struct nlattr *tb[], struct nlattr *data[],
@@ -1790,6 +1792,7 @@ static size_t geneve_get_size(const struct net_device *dev)
17901792
nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_TX */
17911793
nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_RX */
17921794
nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TTL_INHERIT */
1795+
nla_total_size(0) + /* IFLA_GENEVE_INNER_PROTO_INHERIT */
17931796
0;
17941797
}
17951798

0 commit comments

Comments
 (0)