From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [PATCH] Optimise nfq_queue_cb Date: Mon, 1 Jun 2015 19:34:03 +0200 Message-ID: <20150601173403.GA25171@salvia> References: <556C2438.3060203@brocade.com> <20150601110359.GB4002@salvia> <556C3FB8.6070608@brocade.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netfilter-devel@vger.kernel.org To: Paul Aitken Return-path: Received: from mail.us.es ([193.147.175.20]:52533 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932091AbbFAR24 (ORCPT ); Mon, 1 Jun 2015 13:28:56 -0400 Content-Disposition: inline In-Reply-To: <556C3FB8.6070608@brocade.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: On Mon, Jun 01, 2015 at 12:19:20PM +0100, Paul Aitken wrote: > Pablo, > > >On Mon, Jun 01, 2015 at 10:22:00AM +0100, Paul Aitken wrote: > >>ct and myct have both already been checked for non-NULL, > >>so there's no need to check either of them again later. > >> > >>Signed-off-by: Paul Aitken > >>--- > >> src/cthelper.c | 8 +++----- > >> 1 file changed, 3 insertions(+), 5 deletions(-) > >> > >>diff --git a/src/cthelper.c b/src/cthelper.c > >>index 15d5126..6537515 100644 > >>--- a/src/cthelper.c > >>+++ b/src/cthelper.c > >>@@ -325,14 +325,12 @@ static int nfq_queue_cb(const struct nlmsghdr *nlh, void *data) > >> if (pkt_verdict_issue(helper, myct, queue_num, id, verdict, pktb) < 0) > >> goto err_pktb; > >>- if (ct != NULL) > >>- nfct_destroy(ct); > >>+ nfct_destroy(ct); > >void nfct_destroy(struct nf_conntrack *ct) > >{ > > assert(ct != NULL); > > ... > > > >the library doesn't allow NULL pointers. > > ct was already checked for non-NULL when it was assigned around line 297: > > ct = nfct_new(); > if (ct == NULL) > goto err; > > - so ct cannot be NULL at line 325. Right, makes sense. However, your patch doesn't apply here for some reason: $ git am Optimise-nfq_queue_cb.patch Applying: Optimise nfq_queue_cb error: patch failed: src/cthelper.c:325 error: src/cthelper.c: patch does not apply Patch failed at 0001 Optimise nfq_queue_cb When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort"