From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751978AbdHSQ4z (ORCPT ); Sat, 19 Aug 2017 12:56:55 -0400 Received: from mout.web.de ([212.227.15.3]:59650 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751561AbdHSQ4x (ORCPT ); Sat, 19 Aug 2017 12:56:53 -0400 Subject: [PATCH 2/3] ecryptfs: Return an error code only as a constant in ecryptfs_add_global_auth_tok() From: SF Markus Elfring To: ecryptfs@vger.kernel.org, Tyler Hicks Cc: LKML , kernel-janitors@vger.kernel.org References: <56e0a575-2a9e-120f-6a22-96d9fa4b151e@users.sourceforge.net> Message-ID: <0a02a893-798a-d126-3e64-45f8f5185bc7@users.sourceforge.net> Date: Sat, 19 Aug 2017 18:56:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <56e0a575-2a9e-120f-6a22-96d9fa4b151e@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:cnHXkVkWZaMqPdyxKYslMsA8zgstMgyr7Gxho6/xK+C5xzx8itO b8sV7Gl9K+Pa1yXeUbqrGVSZ8cDrAYL5H4sxvgZ3jIVBlcJ/kOrwiHxHVYBnuSd+n0F9pnT A/SCpwa3sHLgHt2myzfJRyFbjzGPX+iL61bXLJv0kPNvVc5FEO9PSppNe5dCry3Pt8DbIn9 KV67+4A4MWPyC3VkHpUpQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:nB0bhEnAwJw=:FUy20v5eFVqw5ZOsK5kdYe pSMo13Q43vihIZ1aJ6N8nv74GGZVKpT9gFf2GTZmFN5smz5nfVNkM8oFOpuIfraQfIkvYaKgm BARv6rX6IGYi/msY8A/e1JA9AzMUw4qeD9h4HzLV01IB9sGGBmk6p/u2/lIuP4E4GrUJ2nxW2 eb6faaxTHdUANRtx0F6zJjt9ANMUTr3Lpiqn185RgcLT8NU6kwx0cUwgx1YcNtqhJYliLqXNu +odVb1ZFTDQr+nDx0wp8EB6dcwtBeVAPUyemQlxYuEr/p0Tbta/da3hEBUerCNADWwgKpaif2 LPud28hoYDN+i6j3Q+gd6zCW9nseQvs1T7sRPjt5AiP+J+HPoY8ryMyBQsFsXq4yJsuisZsqE qeXMMa45Ko4wGxIa1PugTlP3+Y3tP8vVWscljWiXSS92dKjvByqiCji6/tSWw9eacE7JM4wiH 46tefnpTslMrKeof7HT2M1950d2/hz5JvZET8SmT4I2VrPP5N+dzc8DB9xLNB9natN8AUuHQu Q9u8hwQXEEsODu3qRc95sVZFlxhw9Kv1vaHCoLNKFskb3G3KE4rhAzPKmFETuplf0AvaPGGQQ 5U+50MyEIkDNEvPaprRTenrxZtAORXZIgm3+7Ll6luAMsp01ryOk7+EHf+sDpi8qd4Iswa179 BEsFv7Xb0S0q9I07U3Ki+Ei2uzvsB3Bmo12juDBfZFAZWxzHBcYMJsE7lPMTD4JrxoxTrGYHN WUfFidjLKH7ZJovE2rte1odoHw8pd25cqGjS9kXnUZ3TybFAT7BA9ZEgIiRc9TauEuzb5WncA AA6VfI1AVFdDSVPoEvUgPypeLFkMAznpN2ywZnagzQWHwzj/gU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 19 Aug 2017 17:51:53 +0200 * Return an error code without storing it in an intermediate variable. * Delete the jump target "out" and the local variable "rc" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- fs/ecryptfs/keystore.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index 0131b0547699..47c1fd73638d 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -2519,14 +2519,12 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat, char *sig, u32 global_auth_tok_flags) { struct ecryptfs_global_auth_tok *new_auth_tok; - int rc = 0; new_auth_tok = kmem_cache_zalloc(ecryptfs_global_auth_tok_cache, GFP_KERNEL); - if (!new_auth_tok) { - rc = -ENOMEM; - goto out; - } + if (!new_auth_tok) + return -ENOMEM; + memcpy(new_auth_tok->sig, sig, ECRYPTFS_SIG_SIZE_HEX); new_auth_tok->flags = global_auth_tok_flags; new_auth_tok->sig[ECRYPTFS_SIG_SIZE_HEX] = '\0'; @@ -2534,7 +2532,6 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat, list_add(&new_auth_tok->mount_crypt_stat_list, &mount_crypt_stat->global_auth_tok_list); mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex); -out: - return rc; + return 0; } -- 2.14.0