From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 02/11] netfilter: nf_queue: fix reinject verdict handling
Date: Thu, 23 May 2019 23:35:38 +0200 [thread overview]
Message-ID: <20190523213547.15523-3-pablo@netfilter.org> (raw)
In-Reply-To: <20190523213547.15523-1-pablo@netfilter.org>
From: Jagdish Motwani <jagdish.motwani@sophos.com>
This patch fixes netfilter hook traversal when there are more than 1 hooks
returning NF_QUEUE verdict. When the first queue reinjects the packet,
'nf_reinject' starts traversing hooks with a proper hook_index. However,
if it again receives a NF_QUEUE verdict (by some other netfilter hook), it
queues the packet with a wrong hook_index. So, when the second queue
reinjects the packet, it re-executes hooks in between.
Fixes: 960632ece694 ("netfilter: convert hook list to an array")
Signed-off-by: Jagdish Motwani <jagdish.motwani@sophos.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_queue.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 9dc1d6e04946..b5b2be55ca82 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -255,6 +255,7 @@ static unsigned int nf_iterate(struct sk_buff *skb,
repeat:
verdict = nf_hook_entry_hookfn(hook, skb, state);
if (verdict != NF_ACCEPT) {
+ *index = i;
if (verdict != NF_REPEAT)
return verdict;
goto repeat;
--
2.11.0
next prev parent reply other threads:[~2019-05-23 21:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 21:35 [PATCH 00/11] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 01/11] netfilter: nf_tables: fix oops during rule dump Pablo Neira Ayuso
2019-05-23 21:35 ` Pablo Neira Ayuso [this message]
2019-05-23 21:35 ` [PATCH 03/11] netfilter: nft_fib: Fix existence check support Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 04/11] ipvs: Fix use-after-free in ip_vs_in Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 05/11] selftests: netfilter: missing error check when setting up veth interface Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 06/11] netfilter: nat: fix udp checksum corruption Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 07/11] netfilter: nf_flow_table: ignore DF bit setting Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 08/11] netfilter: nft_flow_offload: set liberal tracking mode for tcp Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 09/11] netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 10/11] netfilter: nft_flow_offload: IPCB is only valid for ipv4 family Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 11/11] selftests: netfilter: add flowtable test script Pablo Neira Ayuso
2019-05-23 21:45 ` [PATCH 00/11] Netfilter/IPVS fixes for net David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190523213547.15523-3-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).