Home Home > GIT Browse
diff options
authorYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>2014-10-03 19:06:03 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-15 12:05:31 +0200
commitceb0e516b853d814901731cc83fdfaeb7dd6941a (patch)
parent776c2868cbe4494e76adad43e123e8cd1fd1657f (diff)
driver/base/node: remove unnecessary kfree of node struct from unregister_one_node
commit 33ead538f642a33b1d658782a5d14a40b5014d1f upstream. Commit 92d585ef067d ("numa: fix NULL pointer access and memory leak in unregister_one_node()") added kfree() of node struct in unregister_one_node(). But node struct is freed by node_device_release() which is called in unregister_node(). So by adding the kfree(), node struct is freed two times. While hot removing memory, the commit leads the following BUG_ON(): kernel BUG at mm/slub.c:3346! invalid opcode: 0000 [#1] SMP [...] Call Trace: [...] unregister_one_node [...] try_offline_node [...] remove_memory [...] acpi_memory_device_remove [...] acpi_bus_trim [...] acpi_bus_trim [...] acpi_device_hotplug [...] acpi_hotplug_work_fn [...] process_one_work [...] worker_thread [...] ? rescuer_thread [...] kthread [...] ? kthread_create_on_node [...] ret_from_fork [...] ? kthread_create_on_node This patch removes unnecessary kfree() from unregister_one_node(). Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Cc: Xishi Qiu <qiuxishi@huawei.com> Fixes: 92d585ef067d "numa: fix NULL pointer access and memory leak in unregister_one_node()" Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 8f7ed9933a7c..40e4585f110a 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -603,7 +603,6 @@ void unregister_one_node(int nid)
- kfree(node_devices[nid]);
node_devices[nid] = NULL;