]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
wireguard: allowedips: expand maximum node depth
authorJason A. Donenfeld <Jason@zx2c4.com>
Mon, 7 Aug 2023 13:21:27 +0000 (15:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Aug 2023 16:21:57 +0000 (18:21 +0200)
commit3f00757ab41612d020eb48c787184bf05815897a
tree0e97bf22d91a3889ead5eadfb35b26b4aa8d5651
parentaeb974907642be095e38ecb1a400ca583958b2b0
wireguard: allowedips: expand maximum node depth

commit 46622219aae2b67813fe31a7b8cb7da5baff5c8a upstream.

In the allowedips self-test, nodes are inserted into the tree, but it
generated an even amount of nodes, but for checking maximum node depth,
there is of course the root node, which makes the total number
necessarily odd. With two few nodes added, it never triggered the
maximum depth check like it should have. So, add 129 nodes instead of
128 nodes, and do so with a more straightforward scheme, starting with
all the bits set, and shifting over one each time. Then increase the
maximum depth to 129, and choose a better name for that variable to
make it clear that it represents depth as opposed to bits.

Cc: stable@vger.kernel.org
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Link: https://lore.kernel.org/r/20230807132146.2191597-2-Jason@zx2c4.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireguard/allowedips.c
drivers/net/wireguard/selftest/allowedips.c