emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modprobe: revert checking for /, stop doing basename() on modprobe args

Browse Source 
function                                             old     new   delta
process_module                                       726     719      -7
filename2modname                                      81      67     -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-21)             Total: -21 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2015-01-01 19:02:40 +01:00
parent 6c19d35f68
commit 78854520eb
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modutils/modprobe.c
View File

@@ -238,17 +238,6 @@ static void add_probe(const char *name)
{
struct module_entry *m;
/*
* get_or_add_modentry() strips path from name and works
* on remaining basename.
* This would make "rmmod dir/name" and "modprobe dir/name"
* to work like "rmmod name" and "modprobe name",
* which is wrong, and can be abused via implicit modprobing:
* "ifconfig /usbserial up" tries to modprobe netdev-/usbserial.
*/
if (strchr(name, '/'))
bb_error_msg_and_die("malformed module name '%s'", name);
m = get_or_add_modentry(name);
if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
&& (m->flags & MODULE_FLAG_LOADED)