From patchwork Fri Aug 18 19:08:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 803382 X-Patchwork-Delegate: dwmw2@infradead.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sBZakXYd"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xYt1b3dhzz9t3C for ; Sat, 19 Aug 2017 05:09:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:To:From:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hZMK1a7CCU1yTwFqJhWD7NOoGgLKL/sPP/IgU6I99vA=; b=sBZakXYdpavQd+ rz+/MT7VfwBzXhXy/aixix8s3E9VvhbUQLipRW8Wff2NLidNAJ0yaTM8YTWjH3Sgy/hP+XWVrAKlc 41KmQyHGRRZkoRw0ZQA9wNwtjMZofZsEAxsRFICafVQycWLbISLdNLQrO5ciBMR5ARlaR5m2Gupq2 ICb6fTpiju5XuWXZCT0tT9YrktViEXu6L1768CxLuzUAsoz5jJ9+jcb2V0uCANmO5Sp/ltLfwTSGU NCDkI6Z8gwerDZv8ELNix8bvZ8XJfUxvPH1sk5phIW8/JDHTRTGcpDV2AeMUKHZ5Y/gyUfpJkaADc CN4ezJAshjdkf+B39iIA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dimeB-00059V-8M; Fri, 18 Aug 2017 19:09:31 +0000 Received: from mout.web.de ([212.227.15.4]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dimdm-0004v2-8J for linux-mtd@lists.infradead.org; Fri, 18 Aug 2017 19:09:08 +0000 Received: from [192.168.1.2] ([92.224.120.127]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LcPRO-1dGqCI0W4k-00junX; Fri, 18 Aug 2017 21:08:44 +0200 Subject: [PATCH 3/3] jffs2: Adjust a null pointer check in two functions From: SF Markus Elfring To: linux-mtd@lists.infradead.org, David Woodhouse References: Message-ID: <7be00642-75c6-f774-49f8-51a264b3404d@users.sourceforge.net> Date: Fri, 18 Aug 2017 21:08:42 +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: Content-Language: en-GB X-Provags-ID: V03:K0:IwRfdLi28EKLdHnEYbn38UECZBOrKFSdngnh6BLAyE/iiJr76rD jwct5y/bY8WFg/GEf4utvDEyqA3cgSP9uFT+z3e24Vm3BmK+j0uAUGAp37mWdwkloqaf4Hz YhFGEqzOc+FIlpcDYvmaOTu/oWf5vwd23XaA8wUvFFEcDCnzD95GHP+Po8GtWU6hni6s1HA 4e1U7/25vIepK9mh+GnZw== X-UI-Out-Filterresults: notjunk:1; V01:K0:oStaRgnrlR8=:V1RvJnN6jFYXKNgGjuGimX yne/qQwCVo4ccqkzGk6QzEeaUyVG74Hukr9EvcG+qdyv+/x7vSTS1oWwcgFcudmrkbMQGb9Kq 2Ag7aZMES+ZIPta+Zh08fZLPdXFdodWTOSL+oj52Ib5qtKMD61R3kT3nhWiLOZdzn+PnODbDq yvJ6A1I0RkJPuOjZS60yoPZKkVv+f+JhOr0Q5O/1uk3TeJiaMLf+mFDTI+CqKHh7x76glt+Rg tI1qe3GzQ1tkxETYNq0c0owWEBUjQOGqcqVTAhVC6C3+wZO4CMxyh7UjjH1nJjIz2KBBiAHfQ Iaxwx11PDiTDweILxheFbTUjeqXvBYYKwL6efBRpoTecLHVqnVnGTcs+wgqcQnqF1EPBlbDZu UjeicJlCMTn09uX653QRCMDDa4vqqDbjMaN/qVl/0E6OYKv+w0QJcSD5mB6hVdJdfYc0dzcb4 2uSe5/BiDo4FNk6EzL7Y8/k+d3HuAL0ZnCggLR+qoV8RtnAO/WGPhbvIzTJz1rWi96eUe+u9y /e3AoC7XntAW74IluuRFk+JTKwzA33EIs3MOqaSI2LDmFQvL30sCoyIEbj2bt7SuD93GW/Bgh fh98Z1zKL3jMN7C6G4wu+ELfHsqaWp/2ZF7jYL5cTwVcyTo1EwvwIqeTZ2DeagHqiM/XuVK1a +h4Ht4pXYey7iNeU7XvZDkCAHVEY3UywsJpz6JIrIotBzrLBGc0u24zNWqu/a7Bb/9PrrbOsk L73E7DxeHye8WAPxw8Z1LAPgPP6c7Br9+w3q4UOb4t3q68INlBoiHu/EMpXofIUsXJV9smdYo TJSQsX6t2fjKWpT81r/8b8uST45Vi0IaAahSB66Mtq7WvqSwTc= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170818_120906_733563_F143F411 X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [212.227.15.4 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [212.227.15.4 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Markus Elfring Date: Fri, 18 Aug 2017 20:40:35 +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/jffs2/nodemgmt.c | 3 +-- fs/jffs2/security.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c index a7bbe879cfc3..d5346ba782f7 100644 --- a/fs/jffs2/nodemgmt.c +++ b/fs/jffs2/nodemgmt.c @@ -242,8 +242,7 @@ int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize, static void jffs2_close_nextblock(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb) { - - if (c->nextblock == NULL) { + if (!c->nextblock) { jffs2_dbg(1, "%s(): Erase block at 0x%08x has already been placed in a list\n", __func__, jeb->offset); return; diff --git a/fs/jffs2/security.c b/fs/jffs2/security.c index c2332e30f218..9859b522721f 100644 --- a/fs/jffs2/security.c +++ b/fs/jffs2/security.c @@ -29,7 +29,7 @@ static int jffs2_initxattrs(struct inode *inode, const struct xattr *xattr; int err = 0; - for (xattr = xattr_array; xattr->name != NULL; xattr++) { + for (xattr = xattr_array; xattr->name; xattr++) { err = do_jffs2_setxattr(inode, JFFS2_XPREFIX_SECURITY, xattr->name, xattr->value, xattr->value_len, 0);