diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-01-01 19:02:40 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-01-01 19:02:40 +0100 |
commit | 78854520ebecfd24d5c80a266d6779bd1e069016 (patch) | |
tree | 43b2a405b44b07348a26312488513ad1aa171361 /modutils/modprobe.c | |
parent | 6c19d35f689c911b83073ab1faeffb8040c4b3d9 (diff) | |
download | busybox-w32-78854520ebecfd24d5c80a266d6779bd1e069016.tar.gz busybox-w32-78854520ebecfd24d5c80a266d6779bd1e069016.tar.bz2 busybox-w32-78854520ebecfd24d5c80a266d6779bd1e069016.zip |
modprobe: revert checking for /, stop doing basename() on modprobe args
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>
Diffstat (limited to 'modutils/modprobe.c')
-rw-r--r-- | modutils/modprobe.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index f0904285b..f08f0850d 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -238,17 +238,6 @@ static void add_probe(const char *name) | |||
238 | { | 238 | { |
239 | struct module_entry *m; | 239 | struct module_entry *m; |
240 | 240 | ||
241 | /* | ||
242 | * get_or_add_modentry() strips path from name and works | ||
243 | * on remaining basename. | ||
244 | * This would make "rmmod dir/name" and "modprobe dir/name" | ||
245 | * to work like "rmmod name" and "modprobe name", | ||
246 | * which is wrong, and can be abused via implicit modprobing: | ||
247 | * "ifconfig /usbserial up" tries to modprobe netdev-/usbserial. | ||
248 | */ | ||
249 | if (strchr(name, '/')) | ||
250 | bb_error_msg_and_die("malformed module name '%s'", name); | ||
251 | |||
252 | m = get_or_add_modentry(name); | 241 | m = get_or_add_modentry(name); |
253 | if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS)) | 242 | if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS)) |
254 | && (m->flags & MODULE_FLAG_LOADED) | 243 | && (m->flags & MODULE_FLAG_LOADED) |