From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755381AbbBBK1I (ORCPT ); Mon, 2 Feb 2015 05:27:08 -0500 Received: from mout.web.de ([212.227.15.14]:54443 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933099AbbBBK1G (ORCPT ); Mon, 2 Feb 2015 05:27:06 -0500 Message-ID: <54CF50F1.4080005@users.sourceforge.net> Date: Mon, 02 Feb 2015 11:26:57 +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" , Paul Moore , netdev@vger.kernel.org CC: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH v3 2/3] netlabel: Deletion of an unnecessary check before the function call "cipso_v4_doi_free" References: <54CD4B5F.9010502@users.sourceforge.net> <54CDFCDA.9010802@users.sourceforge.net> <20150201.123054.366525761630045391.davem@davemloft.net> <54CF4FEC.2010906@users.sourceforge.net> In-Reply-To: <54CF4FEC.2010906@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:WcP4euC3E3s3sUJGfyoskfprfzmC6SFY6qWaRX7xakATwwqS1nR 0NUzXQmQmsa52jSQP3uHyFzMqFWAjpR31JdGN6OxU3DnM3nh0GXbPUxGOBV29kNgg0ODg+5 ljI7HAC5uSe3jR1t4V0hqWzrgUgy31N0FRMYnY782IlmGWHk3/sZBXiNGJ2qFaABOlyYAAU tWunn5ROP1a4VfKXW85Ig== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 2 Feb 2015 10:40:30 +0100 The cipso_v4_doi_free() 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: Paul Moore --- net/netlabel/netlabel_cipso_v4.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c index 1796253..7fd1104 100644 --- a/net/netlabel/netlabel_cipso_v4.c +++ b/net/netlabel/netlabel_cipso_v4.c @@ -324,8 +324,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info, return 0; add_std_failure: - if (doi_def) - cipso_v4_doi_free(doi_def); + cipso_v4_doi_free(doi_def); return ret_val; } -- 2.2.2