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 56AC23ACEF1; Mon, 23 Mar 2026 14:07:51 +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=1774274871; cv=none; b=YxGcVayywSQf8/IX00RxRWt+x9oR04MH5Ge91fDqboN5I14rLpwLs4Tu5fDzTr9nTxJOyEAUun1zC62Ou/DHllWbXf7OwGPaNJAH/gCDsD+7RDY25SV2jpI+sJpv9c/kPGvTzjpj7YPSYt5hNTGSCixAEOFEFfV16fsrjmrwhhA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774274871; c=relaxed/simple; bh=l9sKKAr2JxbCi+YGnbJxUwQtQSTJSqMKZx8zM3hAUgo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MR1vz2zLEmrTrL9JSOyWzqQ1BWQ9SkKOBVP0NlXHSs8gT82LLuZRh8b06VGR+M+IpJCznJG2Q9WIfcWDpucEkh/6UpvoSKtdQJxvzn8jNQMpPV+KAxzUcMdwlloc3wKMyZEzLIpr7lM3DfpIRgrX7yejGfutOiFiUxuS4CYFT+w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UbgFCiTv; 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="UbgFCiTv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF57BC4CEF7; Mon, 23 Mar 2026 14:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774274871; bh=l9sKKAr2JxbCi+YGnbJxUwQtQSTJSqMKZx8zM3hAUgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UbgFCiTvY2btFf4DLOqbyAk4rlpoH6ZVzzDCUOkKKaoXjIHGVQIPtaDlq6bpaIG6n aBMGu1qErBtRcZs5msD/pZLVNxjusKZ5g9izOo+rE+xGl8EWPmz7b1X55PuL2/ryqW 68dLRuC9kr+EQrOwelMzwqh9wmC2uNtb1kFO/Z4M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yiming Qian , Pablo Neira Ayuso , Florian Westphal , Sasha Levin Subject: [PATCH 6.18 139/212] netfilter: xt_CT: drop pending enqueued packets on template removal Date: Mon, 23 Mar 2026 14:46:00 +0100 Message-ID: <20260323134508.166321351@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134503.770111826@linuxfoundation.org> References: <20260323134503.770111826@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso [ Upstream commit f62a218a946b19bb59abdd5361da85fa4606b96b ] Templates refer to objects that can go away while packets are sitting in nfqueue refer to: - helper, this can be an issue on module removal. - timeout policy, nfnetlink_cttimeout might remove it. The use of templates with zone and event cache filter are safe, since this just copies values. Flush these enqueued packets in case the template rule gets removed. Fixes: 24de58f46516 ("netfilter: xt_CT: allow to attach timeout policy + glue code") Reported-by: Yiming Qian Signed-off-by: Pablo Neira Ayuso Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/xt_CT.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c index 3ba94c34297cf..498f5871c84a0 100644 --- a/net/netfilter/xt_CT.c +++ b/net/netfilter/xt_CT.c @@ -16,6 +16,7 @@ #include #include #include +#include "nf_internals.h" static inline int xt_ct_target(struct sk_buff *skb, struct nf_conn *ct) { @@ -283,6 +284,9 @@ static void xt_ct_tg_destroy(const struct xt_tgdtor_param *par, struct nf_conn_help *help; if (ct) { + if (info->helper[0] || info->timeout[0]) + nf_queue_nf_hook_drop(par->net); + help = nfct_help(ct); xt_ct_put_helper(help); -- 2.51.0