Revert "Driver core: let request_module() send a /sys/modules/kmod/-uevent"

This reverts commit c353c3fb07.

It turns out that we end up with a loop trying to load the unix
module and calling netfilter to do that.  Will redo the patch
later to not have this loop.

Acked-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-02-23 14:54:57 -08:00
parent 82f0cf9b7c
commit dfff0a0671
4 changed files with 10 additions and 139 deletions

View file

@ -653,11 +653,20 @@ static void wait_for_zero_refcount(struct module *mod)
mutex_lock(&module_mutex);
}
int delete_module(const char *name, unsigned int flags)
asmlinkage long
sys_delete_module(const char __user *name_user, unsigned int flags)
{
struct module *mod;
char name[MODULE_NAME_LEN];
int ret, forced = 0;
if (!capable(CAP_SYS_MODULE))
return -EPERM;
if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
return -EFAULT;
name[MODULE_NAME_LEN-1] = '\0';
if (mutex_lock_interruptible(&module_mutex) != 0)
return -EINTR;
@ -718,21 +727,6 @@ int delete_module(const char *name, unsigned int flags)
return ret;
}
asmlinkage long
sys_delete_module(const char __user *name_user, unsigned int flags)
{
char name[MODULE_NAME_LEN];
if (!capable(CAP_SYS_MODULE))
return -EPERM;
if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
return -EFAULT;
name[MODULE_NAME_LEN-1] = '\0';
return delete_module(name, flags);
}
static void print_unload_info(struct seq_file *m, struct module *mod)
{
struct module_use *use;