When creating nd_namespace_blk, its uuid is copied from nd_label->uuid. In case the memory allocation fails, it goes to the error branch. This check is better to be done immediately after memory allocation, while current implementation does this after assigning claim_class. This patch moves the check immediately after uuid allocation. Signed-off-by: Wei Yang <richardw.yang(a)linux.intel.com&gt; --- drivers/nvdimm/namespace_devs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 681af3a8fd62..9471b9ca04f5 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -2240,11 +2240,11 @@ static struct device *create_namespace_blk(struct nd_region *nd_region, nsblk->lbasize = __le64_to_cpu(nd_label->lbasize); nsblk->uuid = kmemdup(nd_label->uuid, NSLABEL_UUID_LEN, GFP_KERNEL); + if (!nsblk->uuid) + goto blk_err; if (namespace_label_has(ndd, abstraction_guid)) nsblk->common.claim_class = to_nvdimm_cclass(&nd_label->abstraction_guid); - if (!nsblk->uuid) - goto blk_err; memcpy(name, nd_label->name, NSLABEL_NAME_LEN); if (name[0]) nsblk->alt_name = kmemdup(name, NSLABEL_NAME_LEN, -- 2.19.1