From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEBA7C76195 for ; Tue, 16 Jul 2019 11:10:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A29922173B for ; Tue, 16 Jul 2019 11:10:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387623AbfGPLKC (ORCPT ); Tue, 16 Jul 2019 07:10:02 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:37697 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733200AbfGPLKC (ORCPT ); Tue, 16 Jul 2019 07:10:02 -0400 Received: from cpe-2606-a000-111b-405a-0-0-0-162e.dyn6.twc.com ([2606:a000:111b:405a::162e] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1hnLL9-0007ym-9m; Tue, 16 Jul 2019 07:09:58 -0400 Date: Tue, 16 Jul 2019 07:09:17 -0400 From: Neil Horman To: Hariprasad Kelam Cc: Vlad Yasevich , Marcelo Ricardo Leitner , "David S. Miller" , linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] net: sctp: fix warning "NULL check before some freeing functions is not needed" Message-ID: <20190716110917.GA1498@hmswarspite.think-freely.org> References: <20190716022002.GA19592@hari-Inspiron-1545> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190716022002.GA19592@hari-Inspiron-1545> User-Agent: Mutt/1.12.0 (2019-05-25) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Jul 16, 2019 at 07:50:02AM +0530, Hariprasad Kelam wrote: > This patch removes NULL checks before calling kfree. > > fixes below issues reported by coccicheck > net/sctp/sm_make_chunk.c:2586:3-8: WARNING: NULL check before some > freeing functions is not needed. > net/sctp/sm_make_chunk.c:2652:3-8: WARNING: NULL check before some > freeing functions is not needed. > net/sctp/sm_make_chunk.c:2667:3-8: WARNING: NULL check before some > freeing functions is not needed. > net/sctp/sm_make_chunk.c:2684:3-8: WARNING: NULL check before some > freeing functions is not needed. > > Signed-off-by: Hariprasad Kelam > --- > net/sctp/sm_make_chunk.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c > index ed39396..36bd8a6e 100644 > --- a/net/sctp/sm_make_chunk.c > +++ b/net/sctp/sm_make_chunk.c > @@ -2582,8 +2582,7 @@ static int sctp_process_param(struct sctp_association *asoc, > case SCTP_PARAM_STATE_COOKIE: > asoc->peer.cookie_len = > ntohs(param.p->length) - sizeof(struct sctp_paramhdr); > - if (asoc->peer.cookie) > - kfree(asoc->peer.cookie); > + kfree(asoc->peer.cookie); > asoc->peer.cookie = kmemdup(param.cookie->body, asoc->peer.cookie_len, gfp); > if (!asoc->peer.cookie) > retval = 0; > @@ -2648,8 +2647,7 @@ static int sctp_process_param(struct sctp_association *asoc, > goto fall_through; > > /* Save peer's random parameter */ > - if (asoc->peer.peer_random) > - kfree(asoc->peer.peer_random); > + kfree(asoc->peer.peer_random); > asoc->peer.peer_random = kmemdup(param.p, > ntohs(param.p->length), gfp); > if (!asoc->peer.peer_random) { > @@ -2663,8 +2661,7 @@ static int sctp_process_param(struct sctp_association *asoc, > goto fall_through; > > /* Save peer's HMAC list */ > - if (asoc->peer.peer_hmacs) > - kfree(asoc->peer.peer_hmacs); > + kfree(asoc->peer.peer_hmacs); > asoc->peer.peer_hmacs = kmemdup(param.p, > ntohs(param.p->length), gfp); > if (!asoc->peer.peer_hmacs) { > @@ -2680,8 +2677,7 @@ static int sctp_process_param(struct sctp_association *asoc, > if (!ep->auth_enable) > goto fall_through; > > - if (asoc->peer.peer_chunks) > - kfree(asoc->peer.peer_chunks); > + kfree(asoc->peer.peer_chunks); > asoc->peer.peer_chunks = kmemdup(param.p, > ntohs(param.p->length), gfp); > if (!asoc->peer.peer_chunks) > -- > 2.7.4 > > Acked-by: Neil Horman