From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Aitken Subject: Re: [PATCH] Optimise nfq_queue_cb Date: Mon, 1 Jun 2015 12:19:20 +0100 Message-ID: <556C3FB8.6070608@brocade.com> References: <556C2438.3060203@brocade.com> <20150601110359.GB4002@salvia> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Cc: To: Pablo Neira Ayuso Return-path: Received: from mx0a-000f0801.pphosted.com ([67.231.144.122]:21326 "EHLO mx0a-000f0801.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbbFALTc (ORCPT ); Mon, 1 Jun 2015 07:19:32 -0400 In-Reply-To: <20150601110359.GB4002@salvia> Sender: netfilter-devel-owner@vger.kernel.org List-ID: 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. P. >> if (myct->exp != NULL) >> nfexp_destroy(myct->exp); >> - if (myct && myct->priv_data != NULL) >> + if (myct->priv_data != NULL) >> free(myct->priv_data); >> - if (myct != NULL) >> - free(myct); >> + free(myct); >> return MNL_CB_OK; >> err_pktb: >> -- >> 1.9.1 >>