From patchwork Sat Jan 31 17:15:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 435164 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4C74D140283 for ; Sun, 1 Feb 2015 04:16:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754494AbbAaRQ0 (ORCPT ); Sat, 31 Jan 2015 12:16:26 -0500 Received: from mout.web.de ([212.227.15.4]:64281 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865AbbAaRQZ (ORCPT ); Sat, 31 Jan 2015 12:16:25 -0500 Received: from [192.168.1.2] ([78.48.38.141]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0LeLWP-1XsCvh3rjR-00qEYc; Sat, 31 Jan 2015 18:16:05 +0100 Message-ID: <54CD0DCF.9020804@users.sourceforge.net> Date: Sat, 31 Jan 2015 18:15:59 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: "David S. Miller" , Neil Horman , Vlad Yasevich , linux-sctp@vger.kernel.org, netdev@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] net: sctp: Deletion of an unnecessary check before the function call "kfree" References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> In-Reply-To: <5317A59D.4@users.sourceforge.net> X-Provags-ID: V03:K0:8JoHsR38FN9ybgWUlYbuei2Y7UTeBRKT4h3U4ikdQfUtPNAHR3u 75x+oZ3QX+Z69mCwMG/bqIPCi7xiefM9EbHVA7EWUbt5pcgfZcVD0roTAl4kMCDCt3SokPD WhsgU/0IhcfZSeuSEYnHfdxIzDKlikN/8zi4FGTWbispa7pQTykHQ92IqEivmrWra0PvS9P 8VnQ/LB8TJvoaZ5iGwueQ== X-UI-Out-Filterresults: notjunk:1; Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Markus Elfring Date: Sat, 31 Jan 2015 18:10:03 +0100 The kfree() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Acked-By: Neil Horman --- net/sctp/associola.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/sctp/associola.c b/net/sctp/associola.c index f791edd..3c2aefc 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -391,8 +391,7 @@ void sctp_association_free(struct sctp_association *asoc) sctp_asconf_queue_teardown(asoc); /* Free pending address space being deleted */ - if (asoc->asconf_addr_del_pending != NULL) - kfree(asoc->asconf_addr_del_pending); + kfree(asoc->asconf_addr_del_pending); /* AUTH - Free the endpoint shared keys */ sctp_auth_destroy_keys(&asoc->endpoint_shared_keys);