]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
netfilter: nfnetlink_queue: Solve the NFQUEUE/conntrack clash for NF_REPEAT
authorMichal 'vorner' Vaner <michal.vaner@avast.com>
Tue, 4 Sep 2018 11:25:44 +0000 (13:25 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 10 Sep 2018 23:31:47 +0000 (01:31 +0200)
NF_REPEAT places the packet at the beginning of the iptables chain
instead of accepting or rejecting it right away. The packet however will
reach the end of the chain and continue to the end of iptables
eventually, so it needs the same handling as NF_ACCEPT and NF_DROP.

Fixes: 368982cd7d1b ("netfilter: nfnetlink_queue: resolve clash for unconfirmed conntracks")
Signed-off-by: Michal 'vorner' Vaner <michal.vaner@avast.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nfnetlink_queue.c

index ea4ba551abb28cb25c833dc408e23d1313b21bb4..d33094f4ec41e380c57b57b26975f263cfe6bf8f 100644 (file)
@@ -233,6 +233,7 @@ static void nfqnl_reinject(struct nf_queue_entry *entry, unsigned int verdict)
        int err;
 
        if (verdict == NF_ACCEPT ||
+           verdict == NF_REPEAT ||
            verdict == NF_STOP) {
                rcu_read_lock();
                ct_hook = rcu_dereference(nf_ct_hook);