cpu: fix "crash_notes" and "crash_notes_size" leaks in register_cpu()

"crash_notes" and "crash_notes_size" are dynamically created
with device_create_file() but aren't deleted anywhere.
Define "crash_notes" and "crash_notes_size" statically via
attribute groups so that device_register would create them
automatically and files would be destroyed when CPU is destroyed.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 18 insertions, 7 deletions

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 3d48fc887ef4..8f9e264220d2 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -164,7 +164,24 @@ static ssize_t show_crash_notes_size(struct device *dev,
         return rc;
 }
 static DEVICE_ATTR(crash_notes_size, 0400, show_crash_notes_size, NULL);
+
+static struct attribute *crash_note_cpu_attrs[] = {
+        &dev_attr_crash_notes.attr,
+        &dev_attr_crash_notes_size.attr,
+        NULL
+};
+
+static struct attribute_group crash_note_cpu_attr_group = {
+        .attrs = crash_note_cpu_attrs,
+};
+#endif
+
+static const struct attribute_group *common_cpu_attr_groups[] = {
+#ifdef CONFIG_KEXEC
+        &crash_note_cpu_attr_group,
 #endif
+        NULL
+};
 
 /*
  * Print cpu online, possible, present, and system maps
@@ -280,6 +297,7 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
 #ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
         cpu->dev.bus->uevent = arch_cpu_uevent;
 #endif
+        cpu->dev.groups = common_cpu_attr_groups;
         error = device_register(&cpu->dev);
         if (!error && cpu->hotpluggable)
                 register_cpu_control(cpu);
@@ -288,13 +306,6 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
         if (!error)
                 register_cpu_under_node(num, cpu_to_node(num));
 
-#ifdef CONFIG_KEXEC
-        if (!error)
-                error = device_create_file(&cpu->dev, &dev_attr_crash_notes);
-        if (!error)
-                error = device_create_file(&cpu->dev,
-                                           &dev_attr_crash_notes_size);
-#endif
         return error;
 }