From patchwork Sun Nov 30 16:44:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 416195 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 885A8140140 for ; Mon, 1 Dec 2014 03:44:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752345AbaK3Qon (ORCPT ); Sun, 30 Nov 2014 11:44:43 -0500 Received: from mout.web.de ([212.227.17.12]:51141 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917AbaK3Qol (ORCPT ); Sun, 30 Nov 2014 11:44:41 -0500 Received: from [192.168.1.2] ([78.49.11.120]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MCIqT-1Xm53N00H3-00955O; Sun, 30 Nov 2014 17:44:36 +0100 Message-ID: <547B496E.604@users.sourceforge.net> Date: Sun, 30 Nov 2014 17:44:30 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Paul Mackerras , linux-ppp@vger.kernel.org, netdev@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 1/3] net-PPP: Deletion of unnecessary checks 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> <547B4886.4080406@users.sourceforge.net> In-Reply-To: <547B4886.4080406@users.sourceforge.net> X-Provags-ID: V03:K0:ixMVX7XuGQmXehlAQpMWTrQl1IFnbyQu2JX1chA6t5rRW6eXjHV SckeAKr/m8ZvNXb7ni+Iv3/Zg1xqwZsXGCln3hxPzsqoHdm7fUXVQbqVfTKsuqY4g1i4kOf xW0U5zhCM6oFG7BtczJWHd51esG/M2SJbHxsyOJtYfb7/XO4AC7GW2vCodw4gtL8qqZ4WkL cakgJPW9W6U8wWvH4jclQ== 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: Sun, 30 Nov 2014 17:02:07 +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 --- drivers/net/ppp/ppp_mppe.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c index 911b216..7e44212 100644 --- a/drivers/net/ppp/ppp_mppe.c +++ b/drivers/net/ppp/ppp_mppe.c @@ -238,8 +238,7 @@ static void *mppe_alloc(unsigned char *options, int optlen) return (void *)state; out_free: - if (state->sha1_digest) - kfree(state->sha1_digest); + kfree(state->sha1_digest); if (state->sha1) crypto_free_hash(state->sha1); if (state->arc4) @@ -256,13 +255,12 @@ static void mppe_free(void *arg) { struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; if (state) { - if (state->sha1_digest) kfree(state->sha1_digest); - if (state->sha1) - crypto_free_hash(state->sha1); - if (state->arc4) - crypto_free_blkcipher(state->arc4); - kfree(state); + if (state->sha1) + crypto_free_hash(state->sha1); + if (state->arc4) + crypto_free_blkcipher(state->arc4); + kfree(state); } }