[PATCH FIX] NFQUEUE: fix --queue-bypass regression

[PATCH FIX] NFQUEUE: fix --queue-bypass regression

[Holger Eitzenberger]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

Hi Pablo,

Florian reported a regression when using the --queue-bypass with v3 of
the target.

Regression is in since 8746ddcf12bb26 ("netfilter: xt_NFQUEUE:
introduce CPU fanout").

The attached patch fixes that for me.

 /Holger


[-- Attachment #2: nfqueue-fix-bypass.diff --]
[-- Type: text/x-diff, Size: 1068 bytes --]

[27428] NFQUEUE: fix bypass on v3

V3 of the NFQUEUE target ignores the --queue-bypass flag,
causing packets to be dropped when the userspace listener
isn't running.

Regression is in since 8746ddcf12bb26 ("netfilter: xt_NFQUEUE:
introduce CPU fanout").

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>

Index: net-next/net/netfilter/xt_NFQUEUE.c
===================================================================
--- net-next.orig/net/netfilter/xt_NFQUEUE.c
+++ net-next/net/netfilter/xt_NFQUEUE.c
@@ -147,6 +147,7 @@ nfqueue_tg_v3(struct sk_buff *skb, const
 {
 	const struct xt_NFQ_info_v3 *info = par->targinfo;
 	u32 queue = info->queuenum;
+	int ret;
 
 	if (info->queues_total > 1) {
 		if (info->flags & NFQ_FLAG_CPU_FANOUT) {
@@ -157,7 +158,11 @@ nfqueue_tg_v3(struct sk_buff *skb, const
 			queue = nfqueue_hash(skb, par);
 	}
 
-	return NF_QUEUE_NR(queue);
+	ret = NF_QUEUE_NR(queue);
+	if (info->flags & NFQ_FLAG_BYPASS)
+		ret |= NF_VERDICT_FLAG_QUEUE_BYPASS;
+
+	return ret;
 }
 
 static struct xt_target nfqueue_tg_reg[] __read_mostly = {

Re: [PATCH FIX] NFQUEUE: fix --queue-bypass regression

[Pablo Neira Ayuso]

On Mon, Oct 28, 2013 at 02:42:33PM +0100, Holger Eitzenberger wrote:
> Hi Pablo,
> 
> Florian reported a regression when using the --queue-bypass with v3 of
> the target.
> 
> Regression is in since 8746ddcf12bb26 ("netfilter: xt_NFQUEUE:
> introduce CPU fanout").
> 
> The attached patch fixes that for me.

Applied, thanks Holger.