]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
driver/base/node: remove unnecessary kfree of node struct from unregister_one_node
authorYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Fri, 3 Oct 2014 10:06:03 +0000 (19:06 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Oct 2014 21:55:48 +0000 (14:55 -0700)
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>
Cc: stable@vger.kernel.org # v3.16+
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>
drivers/base/node.c

index c6d3ae05f1ca4d98667490d7db0b6375f61b9c26..d51c49c9bafac65ce4ca0b064fc4c825674dc484 100644 (file)
@@ -603,7 +603,6 @@ void unregister_one_node(int nid)
                return;
 
        unregister_node(node_devices[nid]);
-       kfree(node_devices[nid]);
        node_devices[nid] = NULL;
 }