aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 8a94e054230c..225501f620ff 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -653,20 +653,11 @@ static void wait_for_zero_refcount(struct module *mod)
653 mutex_lock(&module_mutex); 653 mutex_lock(&module_mutex);
654} 654}
655 655
656asmlinkage long 656int delete_module(const char *name, unsigned int flags)
657sys_delete_module(const char __user *name_user, unsigned int flags)
658{ 657{
659 struct module *mod; 658 struct module *mod;
660 char name[MODULE_NAME_LEN];
661 int ret, forced = 0; 659 int ret, forced = 0;
662 660
663 if (!capable(CAP_SYS_MODULE))
664 return -EPERM;
665
666 if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
667 return -EFAULT;
668 name[MODULE_NAME_LEN-1] = '\0';
669
670 if (mutex_lock_interruptible(&module_mutex) != 0) 661 if (mutex_lock_interruptible(&module_mutex) != 0)
671 return -EINTR; 662 return -EINTR;
672 663
@@ -727,6 +718,21 @@ sys_delete_module(const char __user *name_user, unsigned int flags)
727 return ret; 718 return ret;
728} 719}
729 720
721asmlinkage long
722sys_delete_module(const char __user *name_user, unsigned int flags)
723{
724 char name[MODULE_NAME_LEN];
725
726 if (!capable(CAP_SYS_MODULE))
727 return -EPERM;
728
729 if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
730 return -EFAULT;
731 name[MODULE_NAME_LEN-1] = '\0';
732
733 return delete_module(name, flags);
734}
735
730static void print_unload_info(struct seq_file *m, struct module *mod) 736static void print_unload_info(struct seq_file *m, struct module *mod)
731{ 737{
732 struct module_use *use; 738 struct module_use *use;