From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbdHSQ5z (ORCPT ); Sat, 19 Aug 2017 12:57:55 -0400 Received: from mout.web.de ([212.227.15.14]:61453 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbdHSQ5x (ORCPT ); Sat, 19 Aug 2017 12:57:53 -0400 Subject: [PATCH 3/3] ecryptfs: Adjust four checks for null pointers 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: Date: Sat, 19 Aug 2017 18:57: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:VvXIa0BbqkBzvDcPh59IElqTsbqumtrpGwkBlhbF+d8eXkz1kli x+DARsAq/moMJwZIEn1CQNF2Vj4EnE/T5pPNjcfQlkE4kSJ8iPrdttArNolOpSUnZRah9fw I6ChxdRkoO19ZGWmITi1zFLOoQb7E8lDex39stOwWbTCKlB5ZWuVXsSomXs/uO6CzX+garh 1B2z3y3swTIlt/f+rdSaQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:PA4cRRKfYCo=:zlOrh00ftYYvOYtpfMDNtM YPu5w8B6stFhBdBrjae/kxODNNhGcIeD7RqiCoMwA8po9C2mUt7iOphSVUIAyKFWofziVGvlw p1zec63+dpEOlrx7qpxpBGkhRyyL6qm0xuJeCzn183BP8m/BM7mxpsG2o7mFM38XMO7l42SGl Kuul5f7Jfr+RPI+avxE1pnoohjjOc0QxQVK7wRsXPlVWdCVZEbvKuoDUVRsN+VrScPRTmNoOz 890+U6EO2QhI8tasojKohwVLeao4HAfLIrUgNBI+Z8NfjZWGq3pFQUh9lBQ+q0WyjM203IkAF 7il85pyVr49rIuPwXli1GIAbSMr7/4Xp0CwcafLmjiKYWSR2zF+wiy0sASH4JLGEW1oRYIVg/ sXJ+clOwlPXKc58oWgUQnVbSq9oYpHv8LrCfI9Y7Q9lqB1u9CsjzAnn+TiUiIkmXOYfmG2Ipf r00FP68oRnCCzQzRz1XZJJvgwV/Yms+29pNzz1ZC1j7v5dmFmCmBto0xH+xQgFDh9KpKSgZvI UfZUZsezc8IzqFBnJH3IgvrC78ZxoBTgqMUWhZ0Y7u4lc7xOm2OeYV4OJCgjEHVNHbTwqxBCh G3xbkdJ6gsxj8E96pyh7sbcS0O1niOWFp13Tg6sp0vTm3dAGZCAvIzW7+TPyUrRLTHAYFMS3O 2OY+3ZIzOvX92pyXPPfvjhH9LSttNfvQwOCoCYwduDTHHAdFt+1dA7AKDs31Iilp02mKHcnaJ d0+3+L321IiRMmSJOSOlvhoAIqFwaGWDcm3moNmwxk8PZdazHXAf5j3V4nWoW0pO8T34jFlby yB0lVHRRnYKQ/MRXXYkBr7FaplpPVYOnac1OigSuU9SKpNkeaE= 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 18:00:22 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring --- fs/ecryptfs/crypto.c | 6 +++--- fs/ecryptfs/keystore.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 4a7ef33d4d79..1cd0902bc936 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -1649,7 +1649,7 @@ ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name, BUG_ON(!mutex_is_locked(&key_tfm_list_mutex)); tmp_tfm = kmem_cache_alloc(ecryptfs_key_tfm_cache, GFP_KERNEL); - if (key_tfm != NULL) + if (key_tfm) (*key_tfm) = tmp_tfm; if (!tmp_tfm) { rc = -ENOMEM; @@ -1668,7 +1668,7 @@ ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name, "cipher with name = [%s]; rc = [%d]\n", tmp_tfm->cipher_name, rc); kmem_cache_free(ecryptfs_key_tfm_cache, tmp_tfm); - if (key_tfm != NULL) + if (key_tfm) (*key_tfm) = NULL; goto out; } @@ -1859,7 +1859,7 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size, size_t src_byte_offset = 0; size_t dst_byte_offset = 0; - if (dst == NULL) { + if (!dst) { (*dst_size) = ecryptfs_max_decoded_size(src_size); goto out; } diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index 47c1fd73638d..5c961e76b211 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -678,7 +678,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, * separator, and then the filename */ s->max_packet_size = (ECRYPTFS_TAG_70_MAX_METADATA_SIZE + s->block_aligned_filename_size); - if (dest == NULL) { + if (!dest) { (*packet_size) = s->max_packet_size; goto out_unlock; } -- 2.14.0