Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Juerg Haefliger <juerg.haefliger@canonical.com>
To:     shaggy@kernel.org, jfs-discussion@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
Cc:     Juerg Haefliger <juerg.haefliger@canonical.com>
Subject: [PATCH] jfs: Add missing NULL pointer check in __get_metapage
Date:   Wed,  4 Oct 2017 04:24:41 -0400
Message-Id: <20171004082441.2405-1-juerg.haefliger@canonical.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

alloc_metapage can return a NULL pointer so check for that. And also emit
an error message if that happens.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 fs/jfs/jfs_metapage.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 1c4b9ad4d7ab..00f21af66872 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -187,14 +187,18 @@ static inline struct metapage *alloc_metapage(gfp_t gfp_mask)
 {
 	struct metapage *mp = mempool_alloc(metapage_mempool, gfp_mask);
 
-	if (mp) {
-		mp->lid = 0;
-		mp->lsn = 0;
-		mp->data = NULL;
-		mp->clsn = 0;
-		mp->log = NULL;
-		init_waitqueue_head(&mp->wait);
+	if (!mp) {
+		jfs_err("mempool_alloc failed!\n");
+		return NULL;
 	}
+
+	mp->lid = 0;
+	mp->lsn = 0;
+	mp->data = NULL;
+	mp->clsn = 0;
+	mp->log = NULL;
+	init_waitqueue_head(&mp->wait);
+
 	return mp;
 }
 
@@ -663,6 +667,8 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
 	} else {
 		INCREMENT(mpStat.pagealloc);
 		mp = alloc_metapage(GFP_NOFS);
+		if (!mp)
+			goto unlock;
 		mp->page = page;
 		mp->sb = inode->i_sb;
 		mp->flag = 0;
-- 
2.14.1


From 1583054844942876126@xxx Fri Nov 03 14:19:07 +0000 2017
X-GM-THRID: 1582788851778167038
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread