Message ID | 20190513181740.5929-1-j.k.motwani@gmail.com |
---|---|
State | Awaiting Upstream |
Delegated to: | David Miller |
Headers | show |
Series | [net,v3] netfilter: nf_queue:fix reinject verdict handling | expand |
On Mon, May 13, 2019 at 11:47:40PM +0530, Jagdish Motwani wrote: > 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. Applied, thanks.
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index 9dc1d6e..b5b2be5 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;