From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752603AbdHPTXk (ORCPT ); Wed, 16 Aug 2017 15:23:40 -0400 Received: from mout.web.de ([212.227.17.11]:49436 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893AbdHPTXj (ORCPT ); Wed, 16 Aug 2017 15:23:39 -0400 Subject: [PATCH 3/3] pstore: Adjust two checks for null pointers From: SF Markus Elfring To: Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck , kernel-janitors@vger.kernel.org Cc: LKML References: <97737d95-d6aa-d24f-1af0-9d4895ceaed2@users.sourceforge.net> Message-ID: <4fa42b22-6ef4-a9a3-2431-c51eeb320437@users.sourceforge.net> Date: Wed, 16 Aug 2017 21:23:30 +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: <97737d95-d6aa-d24f-1af0-9d4895ceaed2@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:0/gcQOQWBQ8ak0th4GDNCV+TIzW5HSfUyDOs5ystggzQLa/OcoB KShqK7M35mjzPAcXDeW3AIsHOP64NuFLkBZ+96RT+tWJaL0Q7Tsp9hFja1Pdbh0Nslmpwis cHZaPgx4WRsBglIXJDabF2+MXwxKWU6xRh3uGY0jtwBNpNiKbMSc4X2rt+0NCscccxA2loP EBwlF7HFlQm89CsgwSJrg== X-UI-Out-Filterresults: notjunk:1;V01:K0:SI7CPDJIGAw=:yNwCMGgV/fgA8u4aNmbmBh 1ubMOtFub4gII5u34b7OzTmwG8amCsp3E4aaMbPDXuFVE06dhDnW73NPeJUZ/JkrkBAm7dwz0 ZEa9/ez1VAiYN3zxHT4UgObetJK+AZOIxcGmcEd4mhUmxmS2HZHKLMV0Hb9cwMJCcs78j9cxt IoyQD4w7bv1rQ8xxEd6hUB21hYmzqvJrdKhdfMFv0KmrE4rFYKQsx5E0outw2wQ2fucSrqaiG HRs0W2CZuJ3CJcWuGakO5CUtgqw5QntoaEsV3shE2b8tRbwwQa+tnKYOhkNJ799N4hysdceOj YgO4f8w0ksNRO5x4PTixFuPtD5CX0WdiUT+guceyeGYWawGq7z0vno1ZSQipCKabLNW89gV7v lDD+msBNno12BZmnx4A09RR8VIwrjVmjaTW/EbY2kE7kiDEf8Lbm/nvhHdlYms85KACZS3leY HGEiBHbAQCR+SXOdUgSRlOl+LKVNwBVPYEQZLE7Fc5JV/IO0aziMbP7oG+0JR7TjhbOuBtdY4 MTJo6WewdXQYxxHJpnsTscxAwCZ/ASejMcIrVfq1Ny+zZ1e3lnsM55PQR//0rrRJfPkpG4SYs ULL88LJVWrgdtTYtauTA1NBLfUZ/ssPiynM9XcMFdCjncz4BZlRY2vBwK7kTG5MWLtVDo0CNM iL/4m++GTmXbqF7QZB7m/A7HczbhN5WaoRRPBIo/ipUqVpEU3UzJ1p4wlPMEjAa84uQ/Qn/g0 qfTirjWFEGSSGErNJxPwrqnfCR8YghLLKqn3ElLccgLVxUtMOZYKDjx1WFyYFIfeDRn8C/GRD fepO1DKW/bLwyb+Cj1oF8wN+IXiVf/CrgbDj4m5mQnujKw5CbQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 16 Aug 2017 21:00:16 +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 affected source code places. Signed-off-by: Markus Elfring --- fs/pstore/ram.c | 2 +- fs/pstore/ram_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 0ef95c384bed..38b81868f7f9 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -333,7 +333,7 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record) record->ecc_notice_size = persistent_ram_ecc_string(prz, NULL, 0); record->buf = kmalloc(size + record->ecc_notice_size + 1, GFP_KERNEL); - if (record->buf == NULL) { + if (!record->buf) { size = -ENOMEM; goto out; } diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index 5d9f7280d757..e37b2d0cb9f4 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -223,7 +223,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz, */ prz->rs_decoder = init_rs(prz->ecc_info.symsize, prz->ecc_info.poly, 0, 1, prz->ecc_info.ecc_size); - if (prz->rs_decoder == NULL) { + if (!prz->rs_decoder) { pr_info("init_rs failed\n"); return -EINVAL; } -- 2.14.0