From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E42AC259CAD; Tue, 25 Mar 2025 12:29:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742905786; cv=none; b=uI28vI+vKID18YxiPOZk9b+sknZSROBtRq6q+YxfGR1ZnK5WhSR/778TZ1L13/IFSAikCKKEvUryamTfhxIVkU0n8e6VN24W8wrzrzA6Jc1b4OIyKOml396P9p2WPosyIIkazVLrZoVrJVpFQPxHaY4BpopByalkE4GcecCtlF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742905786; c=relaxed/simple; bh=k/vZmNE6Jzwx1F8QQ0y+DaWb4qKAHFd7N04VHZ/SKkQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eQXZFDV7lbGtSp+jc4P8Imc22+jEPPJEUy9DleC7nmhlIApdJd2s8akGEzQBS7/cN/qLEngoF5+CPGh9t7l2T+rCE8UbRDh3ynXJ4LIV0QVzGaz7S8nQp0YOsswaR3WmHTjIy3gG588tQp9JIdB4Gl0gmaAjHtiJ5JCD0vouHZo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ccAGeepl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ccAGeepl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95879C4CEE4; Tue, 25 Mar 2025 12:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742905785; bh=k/vZmNE6Jzwx1F8QQ0y+DaWb4qKAHFd7N04VHZ/SKkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ccAGeepl5ZXgoQ4RssfPQw5QbHTjDLypSk8IinV/BWWkKlTaZydUFdCo9SaEqzBti OWNFOB9vKls1wcPQZHCkfBGzLxeqllWIKoJeMqjw/zs3s3k81bjSdcEksBK773WLLO LOZLyajdRVUD+EVDKQg+agJ6XvrvTyCWnyyUn/o8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kuniyuki Iwashima , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 162/198] ipv6: Fix memleak of nhc_pcpu_rth_output in fib_check_nh_v6_gw(). Date: Tue, 25 Mar 2025 08:22:04 -0400 Message-ID: <20250325122200.903803082@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325122156.633329074@linuxfoundation.org> References: <20250325122156.633329074@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuniyuki Iwashima [ 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 Link: https://patch.msgid.link/20250312010333.56001-1-kuniyu@amazon.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/ipv6/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 17918f411386a..c72b4117fc757 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3637,7 +3637,8 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, 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; dev_put(dev); } -- 2.39.5