]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
seg6: Fix validation of nexthop addresses
authorIdo Schimmel <idosch@nvidia.com>
Wed, 4 Jun 2025 11:32:52 +0000 (14:32 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2025 13:32:20 +0000 (15:32 +0200)
[ Upstream commit 7632fedb266d93ed0ed9f487133e6c6314a9b2d1 ]

The kernel currently validates that the length of the provided nexthop
address does not exceed the specified length. This can lead to the
kernel reading uninitialized memory if user space provided a shorter
length than the specified one.

Fix by validating that the provided length exactly matches the specified
one.

Fixes: d1df6fd8a1d2 ("ipv6: sr: define core operations for seg6local lightweight tunnel")
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250604113252.371528-1-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/ipv6/seg6_local.c

index c74705ead9849ff312fd499a6b91eea9cbd36df1..e445a0a45568d1bad2d9320055e7ae9392691859 100644 (file)
@@ -1644,10 +1644,8 @@ static const struct nla_policy seg6_local_policy[SEG6_LOCAL_MAX + 1] = {
        [SEG6_LOCAL_SRH]        = { .type = NLA_BINARY },
        [SEG6_LOCAL_TABLE]      = { .type = NLA_U32 },
        [SEG6_LOCAL_VRFTABLE]   = { .type = NLA_U32 },
-       [SEG6_LOCAL_NH4]        = { .type = NLA_BINARY,
-                                   .len = sizeof(struct in_addr) },
-       [SEG6_LOCAL_NH6]        = { .type = NLA_BINARY,
-                                   .len = sizeof(struct in6_addr) },
+       [SEG6_LOCAL_NH4]        = NLA_POLICY_EXACT_LEN(sizeof(struct in_addr)),
+       [SEG6_LOCAL_NH6]        = NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),
        [SEG6_LOCAL_IIF]        = { .type = NLA_U32 },
        [SEG6_LOCAL_OIF]        = { .type = NLA_U32 },
        [SEG6_LOCAL_BPF]        = { .type = NLA_NESTED },