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

login
register
mail settings
Submitter Florian Westphal
Date May 25, 2013, 11:46 a.m.
Message ID <1369482370-9145-1-git-send-email-fw@strlen.de>
Download mbox | patch
Permalink /patch/246328/
State Accepted
Headers show

Comments

Florian Westphal - May 25, 2013, 11:46 a.m.
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().
Pablo Neira - May 27, 2013, 11:57 a.m.
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.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;