Commit d2ab9940 authored Apr 08, 2019 by zhong jiang Committed by Greg Kroah-Hartman Apr 25, 2019

mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock



When adding the memory by probing memory block in sysfs interface, there is an
obvious issue that we will unlock the device_hotplug_lock when fails to takes it.

That issue was introduced in Commit 8df1d0e4
("mm/memory_hotplug: make add_memory() take the device_hotplug_lock")

We should drop out in time when fails to take the device_hotplug_lock.

Fixes: 8df1d0e4 ("mm/memory_hotplug: make add_memory() take the device_hotplug_lock")
Reported-by: Yang yingliang <yangyingliang@huawei.com>
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent affada72

drivers/base/memory.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -506,7 +506,7 @@ static ssize_t probe_store(struct device dev, struct device_attribute attr,

	ret = lock_device_hotplug_sysfs();		ret = lock_device_hotplug_sysfs();
	if (ret)		if (ret)
	goto out;		return ret;

	nid = memory_add_physaddr_to_nid(phys_addr);		nid = memory_add_physaddr_to_nid(phys_addr);
	ret = __add_memory(nid, phys_addr,		ret = __add_memory(nid, phys_addr,