[PATCH -next, resend] netfilter: nfnetlink_queue: avoid peer_portid test

[PATCH -next, resend] netfilter: nfnetlink_queue: avoid peer_portid test

[Florian Westphal]

The portid is set to NETLINK_CB(skb).portid at create time.
The run-time check will always be false.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 Pablo,
 This is a re-send of a similar patch:
 ( http://patchwork.ozlabs.org/patch/238013/ )

 Change since last version:
 - Remove check altogether instead of moving it to
   instance_create().

diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c
index 2e0e835..cff4449 100644
--- a/net/netfilter/nfnetlink_queue_core.c
+++ b/net/netfilter/nfnetlink_queue_core.c
@@ -509,10 +509,6 @@ __nfqnl_enqueue_packet(struct net *net, struct nfqnl_instance *queue,
 	}
 	spin_lock_bh(&queue->lock);
 
-	if (!queue->peer_portid) {
-		err = -EINVAL;
-		goto err_out_free_nskb;
-	}
 	if (queue->queue_total >= queue->queue_maxlen) {
 		if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {
 			failopen = 1;
-- 
1.8.1.5

Re: [PATCH -next, resend] netfilter: nfnetlink_queue: avoid peer_portid test

[Pablo Neira Ayuso]

On Sat, May 25, 2013 at 01:46:10PM +0200, Florian Westphal wrote:
> The portid is set to NETLINK_CB(skb).portid at create time.
> The run-time check will always be false.

Applied to nf-next, thanks Florian.