From patchwork Fri Apr 19 14:58:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 238013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AE1302C00BA for ; Sat, 20 Apr 2013 00:56:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030803Ab3DSO4X (ORCPT ); Fri, 19 Apr 2013 10:56:23 -0400 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:56699 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030770Ab3DSO4X (ORCPT ); Fri, 19 Apr 2013 10:56:23 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.72) (envelope-from ) id 1UTCje-00022X-21; Fri, 19 Apr 2013 16:56:22 +0200 From: Florian Westphal To: netfilter-devel@vger.kernel.org Cc: Florian Westphal Subject: [PATCH 2/5] netfilter: nfnetlink_queue: avoid peer_portid test Date: Fri, 19 Apr 2013 16:58:24 +0200 Message-Id: <1366383507-16633-3-git-send-email-fw@strlen.de> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1366383507-16633-1-git-send-email-fw@strlen.de> References: <1366383507-16633-1-git-send-email-fw@strlen.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The portid is the netlink port id of the skb that created the queue. Add test to ensure the portid cannot be 0 at create time, and the check at enqueue time will always be false. Signed-off-by: Florian Westphal --- net/netfilter/nfnetlink_queue_core.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index 5e280b3..94e2e4f 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -107,6 +107,9 @@ instance_create(struct nfnl_queue_net *q, u_int16_t queue_num, unsigned int h; int err; + if (portid == 0) + return ERR_PTR(-EINVAL); + spin_lock(&q->instances_lock); if (instance_lookup(q, queue_num)) { err = -EEXIST; @@ -506,10 +509,6 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) } 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;