From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752222AbbFZQZT (ORCPT ); Fri, 26 Jun 2015 12:25:19 -0400 Received: from mout.web.de ([212.227.17.12]:54295 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751913AbbFZQZN (ORCPT ); Fri, 26 Jun 2015 12:25:13 -0400 Message-ID: <558D7CE5.1090205@users.sourceforge.net> Date: Fri, 26 Jun 2015 18:25:09 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Tyler Hicks , ecryptfs@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] eCryptfs: Delete a check before the function call "key_put" 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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:UVKGpnUT+EMvExDcloG3xOIdcXeII1e+kPGl/1nu5ckaA+pcMBX 17Uu208oLVOuQdpMV9wCMjciLTcVE/p6OhyIWRb3qncOf2+w2HORUkOOj8N/BNMBG4lzkHJ p9JjmqMnBLlFD+TE2RHYuEPMvJaF95GdiUGgJwXkUyUrK+gmfw+iRlQNous77/4/2BgeNw0 kEZ1u3Flyelz5ow7AQx5g== X-UI-Out-Filterresults: notjunk:1;V01:K0:vY/2cr703GI=:EErspRjePR0Ls1Kj3cWNlZ 7lZ1OpgprZeGDjjpLCl+cpMnRsAt+npS/ePRwYKpBzqFBH6nS8TysX9ZJ5YVPCJIPrUnxs/WP rq4eVl+r9dOmIMJCrdsQcPTyMY7/9cuRH9p235aRdtSgoxhsF7f9hODIPJPeLej4LXQVLgicr UOT+asqrDyDc+pzMmdmMowP1BhhRLRHaWG2Zp0FhhZY+muGUaAxQKvoyrvwgfSMczHZN4vqKN 4ciP1c1YVIh1mUMY01OtkN3oR04ZOHboDTnwWI8MGXXXUrOdThkmziKqSy1/o3H9wbj5tS212 4G/1XlwJNBbLbkv5bOzesrKezk00jz23n16i1XFl/CfQvgRHV2T+fpjxUzO4CxcLY6H5ItqRl 3OM4IhRs6vYLJYjkObfBn4Efw6CZvYUdZuuW7yPTBaXlLzlHSb2pAdCDu/lpiuy8fhFVszo5B mLQFoYBKo1QaLAsXuIUe4un7df4AhwBCpDJpS+xy3s5JQJrxu316s8gdKYP0u4IOHtOsek77x mCP0jexgv08aUOi5qJSL8H991aLkoYxE3fpOu0cFya5Cpq4LVksPbfVG5GuEHj4/XnxT+KD8K 5GkPR4rkN6s+WwaL2ihsm9f744XGlr2yAaUiHYH7dzaTN26SJYLVpI0uUL/rWQxD7QFlhRIm3 lZHsp6gBESg6mI+gse2YZ7HG/ydoPei2xj3pemdtFKjeV4BvsovvR1NheJBHD1kvrsvc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 26 Jun 2015 18:18:54 +0200 The key_put() function tests whether its argument is NULL and then returns immediately. Thus the test around this call might not be needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- fs/ecryptfs/crypto.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 97315f2..80d6901 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -258,8 +258,7 @@ void ecryptfs_destroy_mount_crypt_stat( &mount_crypt_stat->global_auth_tok_list, mount_crypt_stat_list) { list_del(&auth_tok->mount_crypt_stat_list); - if (auth_tok->global_auth_tok_key - && !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID)) + if (!(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID)) key_put(auth_tok->global_auth_tok_key); kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok); } -- 2.4.4