From: Tejun Heo <tj@kernel.org>
Date: Fri, 30 Aug 2019 13:10:58 +0000 (-0700)
Subject: blkcg: add missing NULL check in ioc_cpd_alloc()
X-Git-Tag: v5.4-rc1~148^2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e916ad29d96485e5aa3d3237bfeab1522c713d5e;p=thirdparty%2Flinux.git

blkcg: add missing NULL check in ioc_cpd_alloc()

ioc_cpd_alloc() forgot to check NULL return from kzalloc().  Add it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 9c8046ac5925a..2aae8ec391ef0 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -1888,8 +1888,10 @@ static struct blkcg_policy_data *ioc_cpd_alloc(gfp_t gfp)
 	struct ioc_cgrp *iocc;
 
 	iocc = kzalloc(sizeof(struct ioc_cgrp), gfp);
-	iocc->dfl_weight = CGROUP_WEIGHT_DFL;
+	if (!iocc)
+		return NULL;
 
+	iocc->dfl_weight = CGROUP_WEIGHT_DFL;
 	return &iocc->cpd;
 }