Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9547773 authored by Holger Eitzenberger's avatar Holger Eitzenberger Committed by Pablo Neira Ayuso
Browse files

netfilter: xt_NFQUEUE: fix --queue-bypass regression 



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 8746ddcf ("netfilter: xt_NFQUEUE:
introduce CPU fanout").

Reported-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarHolger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fecda034

net/netfilter/xt_NFQUEUE.c

+6 −1
Original line number Diff line number Diff line
@@ -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 = {