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

Commit 68783ec7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf 



Pablo Neira Ayuso says:

====================
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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 059dfa6a d9547773

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 = {