NFQUEUE: fix --queue-bypass regression
Subsystems (2)
PATCH 1/1 NFQUEUE: fix --queue-bypass regression
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
[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").
net/netfilter/xt_NFQUEUE.c +6 -1
@@ -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 = {
Quoted 9 lines · Holger Eitzenberger
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.