diff options
| author | Jagdish Motwani <jagdish.motwani@sophos.com> | 2019-05-13 23:47:40 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-22 08:16:15 +0200 |
| commit | 20e4ded10e68a310413a00098fed77dacb20c880 (patch) | |
| tree | a4b44974126cb4c1d3443b2fb1f643b90f928a30 | |
| parent | 8309ce746acc069c4234d3f964300ed3db77d3f2 (diff) | |
| download | linux-stable-20e4ded10e68a310413a00098fed77dacb20c880.tar.gz linux-stable-20e4ded10e68a310413a00098fed77dacb20c880.tar.bz2 linux-stable-20e4ded10e68a310413a00098fed77dacb20c880.zip | |
netfilter: nf_queue: fix reinject verdict handling
[ Upstream commit 946c0d8e6ed43dae6527e878d0077c1e11015db0 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/netfilter/nf_queue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index f7e21953b1de..8260b1e73bbd 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -193,6 +193,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; |