[PATCH] dm cache: handle kmalloc failure allocating background_tracker struct

Path	csiph.com!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Colin King <colin.king@canonical.com>
Newsgroups	linux.kernel
Subject	[PATCH] dm cache: handle kmalloc failure allocating background_tracker struct
Date	Sat, 11 Mar 2017 20:20:02 +0100
Message-ID	<tjUIy-7bG-3@gated-at.bofh.it> (permalink)
X-Original-To	Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@redhat.com>, dm-devel@redhat.com, Shaohua Li <shli@kernel.org>, linux-raid@vger.kernel.org
X-Mailer	git-send-email 2.10.2
MIME-Version	1.0
Content-Type	text/plain; charset="utf-8"
Content-Transfer-Encoding	8bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	48
Organization	linux.* mail to news gateway
X-Original-Cc	kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Sat, 11 Mar 2017 19:09:45 +0000
X-Original-Message-ID	<20170311190945.5930-1-colin.king@canonical.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1598432

Show key headers only | View raw

From: Colin Ian King <colin.king@canonical.com>

currently there is no kmalloc failure check on the allocation of
the background_tracker struct variable b, and so a null return
will lead to a null pointer deference error. Add null check and move
the failure debug message and NULL return so that the two allocation
errors can share the same error exit path.

Detected by CoverityScan, CID#1416587 ("Dereference null return value")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/md/dm-cache-background-tracker.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/md/dm-cache-background-tracker.c b/drivers/md/dm-cache-background-tracker.c
index 9b1afdf..d27edbcc 100644
--- a/drivers/md/dm-cache-background-tracker.c
+++ b/drivers/md/dm-cache-background-tracker.c
@@ -33,6 +33,8 @@ struct background_tracker *btracker_create(unsigned max_work)
 {
 	struct background_tracker *b = kmalloc(sizeof(*b), GFP_KERNEL);
 
+	if (!b)
+		goto err;
 	b->max_work = max_work;
 	atomic_set(&b->pending_promotes, 0);
 	atomic_set(&b->pending_writebacks, 0);
@@ -44,12 +46,15 @@ struct background_tracker *btracker_create(unsigned max_work)
 	b->pending = RB_ROOT;
 	b->work_cache = KMEM_CACHE(bt_work, 0);
 	if (!b->work_cache) {
-		DMERR("couldn't create mempool for background work items");
 		kfree(b);
-		b = NULL;
+		goto err;
 	}
 
 	return b;
+err:
+	DMERR("couldn't create mempool for background work items");
+	return NULL;
+
 }
 EXPORT_SYMBOL_GPL(btracker_create);
 
-- 
2.10.2

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] dm cache: handle kmalloc failure allocating background_tracker struct Colin King <colin.king@canonical.com> - 2017-03-11 20:20 +0100

csiph-web