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 2F1F937B02A; Mon, 23 Mar 2026 16:25:46 +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=1774283147; cv=none; b=aKNoYDKR+7E3FS2+4bqgy92b3FhVqGoKH5k2vFY004WsZVyfR5inEHQbONcKhvYI9GZdqGXTmHb0b2prl9ZP/1SmkVIML45C6NghwblXfKL8x/GIlEEB7em1XjDrRQ1cIis+Qd4BDDTcYuYo/KDQJUsZKf2m4BzxBgJbR3CL+XU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774283147; c=relaxed/simple; bh=wQiiuc3vLB9GpJ+jH1nAkKYS7UBS1tgrLrsqd4LsDRQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZFf/07I7HZTUd2TiR0oXGhdO4/ya64BwyG3W3INHwiaoULYXcJZUaZmfor7PKG++R6Zroby6CEqILOAKK/S/rqxFMjH4LsVG6/v+WC8cFn054TV3/mzvr8LgYpHX325zVh483RGN8zDuhkwcFg07yjtuHI8qCjsUF4W1JF9ZQc4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bxRleNBs; 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="bxRleNBs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A884C2BC9E; Mon, 23 Mar 2026 16:25:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774283146; bh=wQiiuc3vLB9GpJ+jH1nAkKYS7UBS1tgrLrsqd4LsDRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bxRleNBsJWHOG9j/8C0H/nSOd8G9bRpbDfDRif/vhNGdFSfbt2Uy5rvkZshevP5ku o8xZPwbqibzfufUb3F4YOz3tilvxSSrpTLu+ZA1p27h1Fqi9TPgJdGypX1kriyOc0w 7P1P3WNU7v3rcx+16yEmkXNGL/VUYoaivGcYK1RI= 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.1 417/481] netfilter: xt_CT: drop pending enqueued packets on template removal Date: Mon, 23 Mar 2026 14:46:39 +0100 Message-ID: <20260323134535.353063093@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134525.256603107@linuxfoundation.org> References: <20260323134525.256603107@linuxfoundation.org> User-Agent: quilt/0.69 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: 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