fix possible null ptr deref in kallsyms_lookup

[linux-drm-fsl-dcu.git] / kernel / ksysfs.c

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index f119e098e67b1758c3ceffdb095cfdcc40232b2c..559deca5ed15cb31365f37bc58c635557187c698 100644 (file)
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -8,12 +8,12 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kobject.h>
 #include <linux/string.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kexec.h>
 
 #define KERNEL_ATTR_RO(_name) \
 static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
@@ -24,18 +24,18 @@ static struct subsys_attribute _name##_attr = \
 
 #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
 /* current uevent sequence number */
-static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page)
+static ssize_t uevent_seqnum_show(struct kset *kset, char *page)
 {
        return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum);
 }
 KERNEL_ATTR_RO(uevent_seqnum);
 
 /* uevent helper program, used during early boo */
-static ssize_t uevent_helper_show(struct subsystem *subsys, char *page)
+static ssize_t uevent_helper_show(struct kset *kset, char *page)
 {
        return sprintf(page, "%s\n", uevent_helper);
 }
-static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count)
+static ssize_t uevent_helper_store(struct kset *kset, const char *page, size_t count)
 {
        if (count+1 > UEVENT_HELPER_PATH_LEN)
                return -ENOENT;
@@ -48,6 +48,20 @@ static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, s
 KERNEL_ATTR_RW(uevent_helper);
 #endif
 
+#ifdef CONFIG_KEXEC
+static ssize_t kexec_loaded_show(struct kset *kset, char *page)
+{
+       return sprintf(page, "%d\n", !!kexec_image);
+}
+KERNEL_ATTR_RO(kexec_loaded);
+
+static ssize_t kexec_crash_loaded_show(struct kset *kset, char *page)
+{
+       return sprintf(page, "%d\n", !!kexec_crash_image);
+}
+KERNEL_ATTR_RO(kexec_crash_loaded);
+#endif /* CONFIG_KEXEC */
+
 decl_subsys(kernel, NULL, NULL);
 EXPORT_SYMBOL_GPL(kernel_subsys);
 
@@ -55,6 +69,10 @@ static struct attribute * kernel_attrs[] = {
 #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
        &uevent_seqnum_attr.attr,
        &uevent_helper_attr.attr,
+#endif
+#ifdef CONFIG_KEXEC
+       &kexec_loaded_attr.attr,
+       &kexec_crash_loaded_attr.attr,
 #endif
        NULL
 };
@@ -67,7 +85,7 @@ static int __init ksysfs_init(void)
 {
        int error = subsystem_register(&kernel_subsys);
        if (!error)
-               error = sysfs_create_group(&kernel_subsys.kset.kobj,
+               error = sysfs_create_group(&kernel_subsys.kobj,
                                           &kernel_attr_group);
 
        return error;