Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-29 20:29:47 +00:00
Code Issues Projects Releases Wiki Activity

modprobe-small: (un)load all modules which match the alias, not only first one

Browse Source 
Closes 627 and 7034.

Commonly seen case is (un)loading of an alias
which matches ata_generic and a more specific ata module.

For example:

modprobe [-r] pci:v00008086d00007010sv00000000sd00000000bc01sc01i80
(ata_generic and pata_acpi)

modprobe [-r] pci:v00001106d00000571sv00001509sd00009022bc01sc01i8a
(ata_generic and pata_via)

function                                             old     new   delta
process_module                                       615     728    +113
parse_module                                         309     395     +86
find_alias                                           621     653     +32
pathname_matches_modname                              78      79      +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 232/0)             Total: 232 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-04-21 16:59:36 +02:00
parent 5a21c8550e
commit 07e5555a8f
1 changed files with 101 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
modutils/modprobe-small.c
View File

@ -22,6 +22,9 @@
extern int init_module(void *module, unsigned long len, const char *options); extern int init_module(void *module, unsigned long len, const char *options);
extern int delete_module(const char *module, unsigned flags); extern int delete_module(const char *module, unsigned flags);
extern int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret); extern int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret);
/* linux/include/linux/module.h has limit of 64 chars on module names */
#undef MODULE_NAME_LEN
#define MODULE_NAME_LEN 64
#if 1 #if 1
@ -143,6 +146,19 @@ static void replace(char *s, char what, char with)
} }
} }
static char *filename2modname(const char *filename, char *modname)
{
int i;
char *from;
from = bb_get_last_path_component_nostrip(filename);
for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
modname[i] = (from[i] == '-') ? '_' : from[i];
modname[i] = '\0';
return modname;
}
/* Take "word word", return malloced "word",NUL,"word",NUL,NUL */ /* Take "word word", return malloced "word",NUL,"word",NUL,NUL */
static char* str_2_list(const char *str) static char* str_2_list(const char *str)
{ {
@ -277,14 +293,13 @@ static void parse_module(module_info *info, const char *pathname)
static int pathname_matches_modname(const char *pathname, const char *modname) static int pathname_matches_modname(const char *pathname, const char *modname)
{ {
int r;
char name[MODULE_NAME_LEN];
const char *fname = bb_get_last_path_component_nostrip(pathname); const char *fname = bb_get_last_path_component_nostrip(pathname);
const char *suffix = strrstr(fname, ".ko"); const char *suffix = strrstr(fname, ".ko");
//TODO: can do without malloc? safe_strncpy(name, fname, suffix - fname);
char *name = xstrndup(fname, suffix - fname);
int r;
replace(name, '-', '_'); replace(name, '-', '_');
r = (strcmp(name, modname) == 0); r = (strcmp(name, modname) == 0);
free(name);
return r; return r;
} }
@ -447,11 +462,12 @@ static void write_out_dep_bb(int fd)
} }
} }
static module_info* find_alias(const char *alias) static module_info** find_alias(const char *alias)
{ {
int i; int i;
int dep_bb_fd; int dep_bb_fd;
module_info *result; int infoidx;
module_info **infovec;
dbg1_error_msg("find_alias('%s')", alias); dbg1_error_msg("find_alias('%s')", alias);
try_again: try_again:
@ -464,7 +480,9 @@ static module_info* find_alias(const char *alias)
if (!modinfo[i].aliases) { if (!modinfo[i].aliases) {
parse_module(&modinfo[i], modinfo[i].pathname); parse_module(&modinfo[i], modinfo[i].pathname);
} }
return &modinfo[i]; infovec = xzalloc(2 * sizeof(infovec[0]));
infovec[0] = &modinfo[i];
return infovec;
} }
i++; i++;
} }
@ -477,16 +495,13 @@ static module_info* find_alias(const char *alias)
/* Scan all module bodies, extract modinfo (it contains aliases) */ /* Scan all module bodies, extract modinfo (it contains aliases) */
i = 0; i = 0;
result = NULL; infoidx = 0;
infovec = NULL;
while (modinfo[i].pathname) { while (modinfo[i].pathname) {
char *desc, *s; char *desc, *s;
if (!modinfo[i].aliases) { if (!modinfo[i].aliases) {
parse_module(&modinfo[i], modinfo[i].pathname); parse_module(&modinfo[i], modinfo[i].pathname);
} }
if (result) {
i++;
continue;
}
/* "alias1 symbol:sym1 alias2 symbol:sym2" */ /* "alias1 symbol:sym1 alias2 symbol:sym2" */
desc = str_2_list(modinfo[i].aliases); desc = str_2_list(modinfo[i].aliases);
/* Does matching substring exist? */ /* Does matching substring exist? */
@ -498,13 +513,12 @@ static module_info* find_alias(const char *alias)
if (fnmatch(s, alias, 0) == 0) { if (fnmatch(s, alias, 0) == 0) {
dbg1_error_msg("found alias '%s' in module '%s'", dbg1_error_msg("found alias '%s' in module '%s'",
alias, modinfo[i].pathname); alias, modinfo[i].pathname);
result = &modinfo[i]; infovec = xrealloc_vector(infovec, 1, infoidx);
infovec[infoidx++] = &modinfo[i];
break; break;
} }
} }
free(desc); free(desc);
if (result && dep_bb_fd < 0)
return result;
i++; i++;
} }
@ -513,8 +527,8 @@ static module_info* find_alias(const char *alias)
write_out_dep_bb(dep_bb_fd); write_out_dep_bb(dep_bb_fd);
} }
dbg1_error_msg("find_alias '%s' returns %p", alias, result); dbg1_error_msg("find_alias '%s' returns %d results", alias, infoidx);
return result; return infovec;
} }
#if ENABLE_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED #if ENABLE_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
@ -550,14 +564,23 @@ static int already_loaded(const char *name)
static void process_module(char *name, const char *cmdline_options) static void process_module(char *name, const char *cmdline_options)
{ {
char *s, *deps, *options; char *s, *deps, *options;
module_info **infovec;
module_info *info; module_info *info;
int infoidx;
int is_rmmod = (option_mask32 & OPT_r) != 0; int is_rmmod = (option_mask32 & OPT_r) != 0;
dbg1_error_msg("process_module('%s','%s')", name, cmdline_options); dbg1_error_msg("process_module('%s','%s')", name, cmdline_options);
replace(name, '-', '_'); replace(name, '-', '_');
dbg1_error_msg("already_loaded:%d is_rmmod:%d", already_loaded(name), is_rmmod); dbg1_error_msg("already_loaded:%d is_rmmod:%d", already_loaded(name), is_rmmod);
if (already_loaded(name) != is_rmmod) { /*
* We used to have "is_rmmod != already_loaded(name)" check here, but
* modprobe -r pci:v00008086d00007010sv00000000sd00000000bc01sc01i80
* won't unload modules (there are more than one)
* which have this alias.
*/
if (!is_rmmod && already_loaded(name)) {
dbg1_error_msg("nothing to do for '%s'", name); dbg1_error_msg("nothing to do for '%s'", name);
return; return;
} }
@ -586,39 +609,51 @@ static void process_module(char *name, const char *cmdline_options)
if (!module_count) { if (!module_count) {
/* Scan module directory. This is done only once. /* Scan module directory. This is done only once.
* It will attempt module load, and will exit(EXIT_SUCCESS) * It will attempt module load, and will exit(EXIT_SUCCESS)
* on success. */ * on success.
*/
module_found_idx = -1; module_found_idx = -1;
recursive_action(".", recursive_action(".",
ACTION_RECURSE, /* flags */ ACTION_RECURSE, /* flags */
fileAction, /* file action */ fileAction, /* file action */
NULL, /* dir action */ NULL, /* dir action */
name, /* user data */ name, /* user data */
0); /* depth */ 0 /* depth */
);
dbg1_error_msg("dirscan complete"); dbg1_error_msg("dirscan complete");
/* Module was not found, or load failed, or is_rmmod */ /* Module was not found, or load failed, or is_rmmod */
if (module_found_idx >= 0) { /* module was found */ if (module_found_idx >= 0) { /* module was found */
info = &modinfo[module_found_idx]; infovec = xzalloc(2 * sizeof(infovec[0]));
infovec[0] = &modinfo[module_found_idx];
} else { /* search for alias, not a plain module name */ } else { /* search for alias, not a plain module name */
info = find_alias(name); infovec = find_alias(name);
} }
} else { } else {
info = find_alias(name); infovec = find_alias(name);
} }
// Problem here: there can be more than one module /* There can be more than one module for the given alias. For example,
// for the given alias. For example, * "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches
// "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches * ata_piix because it has alias "pci:v00008086d00007010sv*sd*bc*sc*i*"
// ata_piix because it has an alias "pci:v00008086d00007010sv*sd*bc*sc*i*" * and ata_generic, it has alias "pci:v*d*sv*sd*bc01sc01i*"
// and ata_generic, it has an alias "pci:v*d*sv*sd*bc01sc01i*" * Standard modprobe loads them both. We achieve it by returning
// Standard modprobe would load them both. * a *list* of modinfo pointers from find_alias().
// In this code, find_alias() returns only the first matching module. */
/* rmmod? unload it by name */ /* rmmod or modprobe -r? unload module(s) */
if (is_rmmod) { if (is_rmmod) {
if (delete_module(name, O_NONBLOCK | O_EXCL) != 0) { infoidx = 0;
if (!(option_mask32 & OPT_q)) while ((info = infovec[infoidx++]) != NULL) {
bb_perror_msg("remove '%s'", name); int r;
goto ret; char modname[MODULE_NAME_LEN];
filename2modname(info->pathname, modname);
r = delete_module(modname, O_NONBLOCK | O_EXCL);
dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r);
if (r != 0) {
if (!(option_mask32 & OPT_q))
bb_perror_msg("remove '%s'", modname);
goto ret;
}
} }
if (applet_name[0] == 'r') { if (applet_name[0] == 'r') {
@ -634,7 +669,7 @@ static void process_module(char *name, const char *cmdline_options)
*/ */
} }
if (!info) { if (!infovec) {
/* both dirscan and find_alias found nothing */ /* both dirscan and find_alias found nothing */
if (!is_rmmod && applet_name[0] != 'd') /* it wasn't rmmod or depmod */ if (!is_rmmod && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
bb_error_msg("module '%s' not found", name); bb_error_msg("module '%s' not found", name);
@ -642,36 +677,41 @@ static void process_module(char *name, const char *cmdline_options)
goto ret; goto ret;
} }
/* Iterate thru dependencies, trying to (un)load them */ infoidx = 0;
deps = str_2_list(info->deps); while ((info = infovec[infoidx++]) != NULL) {
for (s = deps; *s; s += strlen(s) + 1) { /* Iterate thru dependencies, trying to (un)load them */
//if (strcmp(name, s) != 0) // N.B. do loops exist? deps = str_2_list(info->deps);
dbg1_error_msg("recurse on dep '%s'", s); for (s = deps; *s; s += strlen(s) + 1) {
process_module(s, NULL); //if (strcmp(name, s) != 0) // N.B. do loops exist?
dbg1_error_msg("recurse on dep '%s' done", s); dbg1_error_msg("recurse on dep '%s'", s);
} process_module(s, NULL);
free(deps); dbg1_error_msg("recurse on dep '%s' done", s);
}
free(deps);
/* modprobe -> load it */ if (is_rmmod)
if (!is_rmmod) { continue;
if (!options || strstr(options, "blacklist") == NULL) {
errno = 0; /* We are modprobe: load it */
if (load_module(info->pathname, options) != 0) { if (options && strstr(options, "blacklist")) {
if (EEXIST != errno) {
bb_error_msg("'%s': %s",
info->pathname,
moderror(errno));
} else {
dbg1_error_msg("'%s': %s",
info->pathname,
moderror(errno));
}
}
} else {
dbg1_error_msg("'%s': blacklisted", info->pathname); dbg1_error_msg("'%s': blacklisted", info->pathname);
continue;
}
errno = 0;
if (load_module(info->pathname, options) != 0) {
if (EEXIST != errno) {
bb_error_msg("'%s': %s",
info->pathname,
moderror(errno));
} else {
dbg1_error_msg("'%s': %s",
info->pathname,
moderror(errno));
}
} }
} }
ret: ret:
free(infovec);
free(options); free(options);
//TODO: return load attempt result from process_module. //TODO: return load attempt result from process_module.
//If dep didn't load ok, continuing makes little sense. //If dep didn't load ok, continuing makes little sense.