Commit f62a218a authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Florian Westphal
Browse files

netfilter: xt_CT: drop pending enqueued packets on template removal 



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: 24de58f4 ("netfilter: xt_CT: allow to attach timeout policy + glue code")
Reported-by: default avatarYiming Qian <yimingqian591@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 36eae095

net/netfilter/xt_CT.c

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <net/netfilter/nf_conntrack_ecache.h>

#include <net/netfilter/nf_conntrack_timeout.h>

#include <net/netfilter/nf_conntrack_zones.h>

#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);