From nobody Fri Dec 19 17:34:24 2025 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 0DA651CDDE8; Sun, 24 Mar 2024 22:46:42 +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=1711320402; cv=none; b=BDcnoy2NTTZ7oWXLRZFkXqnpGJZ2PKrHdPJpa/4NgG9kaYt8Nf2V5WJJyjlGjimeylGLmllmZdLWrNxD5epuNVvX8oQlvgiDRZD63g6+cccv8vArfbQEui1UUKX7BiFO8fk8zQhfKDnHw+WPiR2Qj4lvECP7fNpdpU4BwxMyMoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320402; c=relaxed/simple; bh=0xJ+qloyoX7no++YWtVrlTrA5iVh3b8gZloLuJhdlI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CThoWpLomvlEEABkvErk4qF38WSECujDCQJE3iYXQ01Hno2d0qZopB1dkekYZPUhWlHRQYqjwNZKR+6E0oC47nnjz5+P7PHfEc0lG1CbEzhpnPWKVQNckZ64jyL4T+bKVqYxngQGgV4NnXiA9txu7R0dka2SQwe4J2tRsE4oXZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fLXfxWkc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fLXfxWkc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BAC3C433C7; Sun, 24 Mar 2024 22:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320401; bh=0xJ+qloyoX7no++YWtVrlTrA5iVh3b8gZloLuJhdlI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fLXfxWkcsx07pX/pwUaHgqAKNZ7bqmhELJu1LNuiR8XxVP6d6fSVXtpGIMcp8DBpr Gs4CnQykJgekqsbtiW6zOirXAbxnKoUvaY3vvWAIUPumxnNsRO6/avtM+Md5rhzt9k TwfZ+1QUcEqxu4qTEIL9eLG6V6CF8LZ9Pt08qDzyUd5LF2y3axnXThUSffxpFhG/fa xz+Hyp3q7VmtdhXAgwpWqDRbW8GEG4x8Ko+JJWIeQ+8a7GuvbfQn2W3NsuK3R5q9da G3QhtB+rOFKvzgJs7gDF+0qH78RgM807z80AsiXm8P8KOpGevZLbAh268zkDLS6k0m u6hbbcgL/hi6A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Quan Tian , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.8 708/715] netfilter: nf_tables: Fix a memory leak in nf_tables_updchain Date: Sun, 24 Mar 2024 18:34:47 -0400 Message-ID: <20240324223455.1342824-709-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Quan Tian [ Upstream commit 7eaf837a4eb5f74561e2486972e7f5184b613f6e ] If nft_netdev_register_hooks() fails, the memory associated with nft_stats is not freed, causing a memory leak. This patch fixes it by moving nft_stats_alloc() down after nft_netdev_register_hooks() succeeds. Fixes: b9703ed44ffb ("netfilter: nf_tables: support for adding new devices = to an existing netdev chain") Signed-off-by: Quan Tian Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 0fe2abf27d12f..6873c9815cd31 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2619,19 +2619,6 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u= 8 genmask, u8 policy, } } =20 - if (nla[NFTA_CHAIN_COUNTERS]) { - if (!nft_is_base_chain(chain)) { - err =3D -EOPNOTSUPP; - goto err_hooks; - } - - stats =3D nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]); - if (IS_ERR(stats)) { - err =3D PTR_ERR(stats); - goto err_hooks; - } - } - if (!(table->flags & NFT_TABLE_F_DORMANT) && nft_is_base_chain(chain) && !list_empty(&hook.list)) { @@ -2646,6 +2633,20 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u= 8 genmask, u8 policy, } =20 unregister =3D true; + + if (nla[NFTA_CHAIN_COUNTERS]) { + if (!nft_is_base_chain(chain)) { + err =3D -EOPNOTSUPP; + goto err_hooks; + } + + stats =3D nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]); + if (IS_ERR(stats)) { + err =3D PTR_ERR(stats); + goto err_hooks; + } + } + err =3D -ENOMEM; trans =3D nft_trans_alloc(ctx, NFT_MSG_NEWCHAIN, sizeof(struct nft_trans_chain)); --=20 2.43.0