]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ipv6: Fix memleak of nhc_pcpu_rth_output in fib_check_nh_v6_gw().
authorKuniyuki Iwashima <kuniyu@amazon.com>
Wed, 12 Mar 2025 01:03:25 +0000 (18:03 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Mar 2025 20:59:53 +0000 (21:59 +0100)
[ Upstream commit 9740890ee20e01f99ff1dde84c63dcf089fabb98 ]

fib_check_nh_v6_gw() expects that fib6_nh_init() cleans up everything
when it fails.

Commit 7dd73168e273 ("ipv6: Always allocate pcpu memory in a fib6_nh")
moved fib_nh_common_init() before alloc_percpu_gfp() within fib6_nh_init()
but forgot to add cleanup for fib6_nh->nh_common.nhc_pcpu_rth_output in
case it fails to allocate fib6_nh->rt6i_pcpu, resulting in memleak.

Let's call fib_nh_common_release() and clear nhc_pcpu_rth_output in the
error path.

Note that we can remove the fib6_nh_release() call in nh_create_ipv6()
later in net-next.git.

Fixes: 7dd73168e273 ("ipv6: Always allocate pcpu memory in a fib6_nh")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250312010333.56001-1-kuniyu@amazon.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/ipv6/route.c

index 5715d54f3d0bed85f254d91159db6642987da996..f13b2eb9046338269b1a8bd1e86b3a457258eea0 100644 (file)
@@ -3636,7 +3636,8 @@ out:
                in6_dev_put(idev);
 
        if (err) {
-               lwtstate_put(fib6_nh->fib_nh_lws);
+               fib_nh_common_release(&fib6_nh->nh_common);
+               fib6_nh->nh_common.nhc_pcpu_rth_output = NULL;
                fib6_nh->fib_nh_lws = NULL;
                netdev_put(dev, dev_tracker);
        }