1 files changed, 17 insertions, 5 deletions

diff --git a/kernel/module.c b/kernel/module.c
index fbc51de6444e..9da5af668a20 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1148,8 +1148,10 @@ int mod_sysfs_setup(struct module *mod,
                 goto out;
 
         mod->holders_dir = kobject_add_dir(&mod->mkobj.kobj, "holders");
-        if (!mod->holders_dir)
+        if (!mod->holders_dir) {
+                err = -ENOMEM;
                 goto out_unreg;
+        }
 
         err = module_param_sysfs_setup(mod, kparam, num_params);
         if (err)
@@ -2384,8 +2386,13 @@ void module_add_driver(struct module *mod, struct device_driver *drv)
 
                 /* Lookup built-in module entry in /sys/modules */
                 mkobj = kset_find_obj(&module_subsys.kset, drv->mod_name);
-                if (mkobj)
+                if (mkobj) {
                         mk = container_of(mkobj, struct module_kobject, kobj);
+                        /* remember our module structure */
+                        drv->mkobj = mk;
+                        /* kset_find_obj took a reference */
+                        kobject_put(mkobj);
+                }
         }
 
         if (!mk)
@@ -2405,17 +2412,22 @@ EXPORT_SYMBOL(module_add_driver);
 
 void module_remove_driver(struct device_driver *drv)
 {
+        struct module_kobject *mk = NULL;
         char *driver_name;
 
         if (!drv)
                 return;
 
         sysfs_remove_link(&drv->kobj, "module");
-        if (drv->owner && drv->owner->mkobj.drivers_dir) {
+
+        if (drv->owner)
+                mk = &drv->owner->mkobj;
+        else if (drv->mkobj)
+                mk = drv->mkobj;
+        if (mk && mk->drivers_dir) {
                 driver_name = make_driver_name(drv);
                 if (driver_name) {
-                        sysfs_remove_link(drv->owner->mkobj.drivers_dir,
-                                          driver_name);
+                        sysfs_remove_link(mk->drivers_dir, driver_name);
                         kfree(driver_name);
                 }
         }