Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32423424 authored by Aditya Pakki's avatar Aditya Pakki Committed by Greg Kroah-Hartman
Browse files

libnvdimm/btt: Fix a kmemdup failure check 



[ Upstream commit 486fa92df4707b5df58d6508728bdb9321a59766 ]

In case kmemdup fails, the fix releases resources and returns to
avoid the NULL pointer dereference.

Signed-off-by: default avatarAditya Pakki <pakki001@umn.edu>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 581fabcf

drivers/nvdimm/btt_devs.c

+13 −5
Original line number Diff line number Diff line
@@ -190,14 +190,15 @@ static struct device *__nd_btt_create(struct nd_region *nd_region, 
		return NULL;



	nd_btt->id = ida_simple_get(&nd_region->btt_ida, 0, 0, GFP_KERNEL);

	if (nd_btt->id < 0) {

		kfree(nd_btt);

		return NULL;

	}

	if (nd_btt->id < 0)

		goto out_nd_btt;



	nd_btt->lbasize = lbasize;

	if (uuid)

	if (uuid) {

		uuid = kmemdup(uuid, 16, GFP_KERNEL);

		if (!uuid)

			goto out_put_id;

	}

	nd_btt->uuid = uuid;

	dev = &nd_btt->dev;

	dev_set_name(dev, "btt%d.%d", nd_region->id, nd_btt->id);
@@ -212,6 +213,13 @@ static struct device *__nd_btt_create(struct nd_region *nd_region, 
		return NULL;

	}

	return dev;



out_put_id:

	ida_simple_remove(&nd_region->btt_ida, nd_btt->id);



out_nd_btt:

	kfree(nd_btt);

	return NULL;

}



struct device *nd_btt_create(struct nd_region *nd_region)