Commit a989fde7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libnvdimm-fixes-7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull libnvdimm fix from Ira Weiny:

 - Fix old potential use after free bug

* tag 'libnvdimm-fixes-7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  nvdimm/bus: Fix potential use after free in asynchronous initialization
parents 9e22d8e1 a8aec142

drivers/nvdimm/bus.c

+3 −2
Original line number Diff line number Diff line
@@ -486,14 +486,15 @@ EXPORT_SYMBOL_GPL(nd_synchronize); 
static void nd_async_device_register(void *d, async_cookie_t cookie)

{

	struct device *dev = d;

	struct device *parent = dev->parent;



	if (device_add(dev) != 0) {

		dev_err(dev, "%s: failed\n", __func__);

		put_device(dev);

	}

	put_device(dev);

	if (dev->parent)

		put_device(dev->parent);

	if (parent)

		put_device(parent);

}



static void nd_async_device_unregister(void *d, async_cookie_t cookie)