summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMichal 'vorner' Vaner <michal.vaner@avast.com>2018-09-04 13:25:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-10 08:56:02 +0200
commit419033c32a82dad2d093d1ecdd0d3bf83fac2ddb (patch)
tree0afdbd073f5cbb95995241ea82147b79f3200bbf /net
parente63d53f2835dda2f292e1266dcd2a6dabd554957 (diff)
netfilter: nfnetlink_queue: Solve the NFQUEUE/conntrack clash for NF_REPEAT
[ Upstream commit ad18d7bf68a3da860ebb62a59c449804a6d237b4 ] 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> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nfnetlink_queue.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index ea4ba551abb2..d33094f4ec41 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -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);