netfilter fix for net
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter fix for net
Hi David,
This pull request contains the following netfilter fix:
* fix --queue-bypass in xt_NFQUEUE revision 3. While adding the revision 3 of this target, the bypass flags were not correctly handled anymore, thus, breaking packet bypassing if no application is listening from userspace, patch from Holger Eitzenberger, reported by Florian Westphal.
You can pull this change from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
Thanks!
----------------------------------------------------------------
The following changes since commit fecda03493646b53f53892fa3c38c75ba9310374:
net: sctp: fix ASCONF to allow non SCTP_ADDR_SRC addresses in ipv6 (2013-10-23 16:57:14 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
for you to fetch changes up to d954777324ffcba0b2f8119c102237426c654eeb:
netfilter: xt_NFQUEUE: fix --queue-bypass regression (2013-10-29 13:05:54 +0100)
----------------------------------------------------------------
Holger Eitzenberger (1):
netfilter: xt_NFQUEUE: fix --queue-bypass regression
net/netfilter/xt_NFQUEUE.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: xt_NFQUEUE: fix --queue-bypass regression
From: Holger Eitzenberger <[email protected]>
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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/netfilter/xt_NFQUEUE.c +6 -1
@@ -147,6 +147,7 @@ nfqueue_tg_v3(struct sk_buff *skb, const struct xt_action_param *par) {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 struct xt_action_param *par) 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 = {
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Tue, 29 Oct 2013 13:13:15 +0100
Quoted 11 lines
This pull request contains the following netfilter fix:
* fix --queue-bypass in
xt_NFQUEUErevision 3. While adding the revision 3 of this target, the bypass flags were not correctly handled anymore, thus, breaking packet bypassing if no application is listening from userspace, patch from Holger Eitzenberger, reported by Florian Westphal.You can pull this change from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.gitmaster
Pulled, thanks Pablo.