Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-06 13:30:24 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Yann E. Morin, something to do with bugs 276 and 272.

Browse Source
This commit is contained in:
Rob Landley 2005-12-12 19:38:44 +00:00
parent 126da9ec2d
commit e919096271
1 changed files with 423 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

781
modutils/modprobe.c
View File

@ -6,6 +6,8 @@
* Copyright (c) 2003 by Andrew Dennison, andrew.dennison@motec.com.au * Copyright (c) 2003 by Andrew Dennison, andrew.dennison@motec.com.au
* Copyright (c) 2005 by Jim Bauer, jfbauer@nfr.com * Copyright (c) 2005 by Jim Bauer, jfbauer@nfr.com
* *
* Portions Copyright (c) 2005 by Yann E. MORIN, yann.morin.1998@anciens.enib.fr
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
@ -21,26 +23,31 @@
#include <fcntl.h> #include <fcntl.h>
#include "busybox.h" #include "busybox.h"
struct mod_opt_t { /* one-way list of options to pass to a module */
char * m_opt_val;
struct dep_t { struct mod_opt_t * m_next;
char * m_name;
char * m_path;
char * m_options;
int m_isalias : 1;
int m_reserved : 15;
int m_depcnt : 16;
char ** m_deparr;
struct dep_t * m_next;
}; };
struct mod_list_t { struct dep_t { /* one-way list of dependency rules */
/* a dependency rule */
char * m_name; /* the module name*/
char * m_path; /* the module file path */
struct mod_opt_t * m_options; /* the module options */
int m_isalias : 1; /* the module is an alias */
int m_reserved : 15; /* stuffin' */
int m_depcnt : 16; /* the number of dependable module(s) */
char ** m_deparr; /* the list of dependable module(s) */
struct dep_t * m_next; /* the next dependency rule */
};
struct mod_list_t { /* two-way list of modules to process */
/* a module description */
char * m_name; char * m_name;
char * m_path; char * m_path;
char * m_options; struct mod_opt_t * m_options;
struct mod_list_t * m_prev; struct mod_list_t * m_prev;
struct mod_list_t * m_next; struct mod_list_t * m_next;
@ -49,7 +56,6 @@ struct mod_list_t {
static struct dep_t *depend; static struct dep_t *depend;
static int autoclean, show_only, quiet, do_syslog, verbose; static int autoclean, show_only, quiet, do_syslog, verbose;
static int k_version;
static int parse_tag_value ( char *buffer, char **ptag, char **pvalue ) static int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
{ {
@ -101,287 +107,30 @@ static char *reads ( int fd, char *buffer, size_t len )
return 0; return 0;
} }
static struct dep_t *build_dep ( void ) /*
* This function appends an option to a list
*/
struct mod_opt_t *append_option( struct mod_opt_t *opt_list, char *opt )
{ {
int fd; struct mod_opt_t *ol = opt_list;
struct utsname un;
struct dep_t *first = 0;
struct dep_t *current = 0;
char buffer[2048];
char *filename = buffer;
int continuation_line = 0;
k_version = 0; if( ol ) {
if ( uname ( &un )) while( ol-> m_next ) {
return 0; ol = ol-> m_next;
// check for buffer overflow in following code
if ( bb_strlen ( un.release ) > ( sizeof( buffer ) - 64 )) {
return 0;
} }
if (un.release[0] == '2') { ol-> m_next = xmalloc( sizeof( struct mod_opt_t ) );
k_version = un.release[2] - '0'; ol = ol-> m_next;
} else {
ol = opt_list = xmalloc( sizeof( struct mod_opt_t ) );
} }
strcpy ( filename, "/lib/modules/" ); ol-> m_opt_val = bb_xstrdup( opt );
strcat ( filename, un.release ); ol-> m_next = NULL;
strcat ( filename, "/modules.dep" );
if (( fd = open ( filename, O_RDONLY )) < 0 ) { return opt_list;
/* Ok, that didn't work. Fall back to looking in /lib/modules */
if (( fd = open ( "/lib/modules/modules.dep", O_RDONLY )) < 0 ) {
return 0;
}
}
while ( reads ( fd, buffer, sizeof( buffer ))) {
int l = bb_strlen ( buffer );
char *p = 0;
while ( isspace ( buffer [l-1] )) {
buffer [l-1] = 0;
l--;
}
if ( l == 0 ) {
continuation_line = 0;
continue;
}
if ( !continuation_line ) {
char *col = strchr ( buffer, ':' );
char *dot = col;
if ( col ) {
char *mods;
char *modpath;
char *mod;
*col = 0;
mods = strrchr ( buffer, '/' );
if ( !mods )
mods = buffer;
else
mods++;
modpath = strchr ( buffer, '/' );
if ( !modpath )
modpath = buffer;
#if defined(CONFIG_FEATURE_2_6_MODULES)
if ((k_version > 4) && ( *(col-3) == '.' ) &&
( *(col-2) == 'k' ) && ( *(col-1) == 'o' ))
dot = col - 3;
else
#endif
if (( *(col-2) == '.' ) && ( *(col-1) == 'o' ))
dot = col - 2;
mod = bb_xstrndup ( mods, dot - mods );
if ( !current ) {
first = current = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
}
else {
current-> m_next = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
current = current-> m_next;
}
current-> m_name = mod;
current-> m_path = bb_xstrdup(modpath);
current-> m_options = 0;
current-> m_isalias = 0;
current-> m_depcnt = 0;
current-> m_deparr = 0;
current-> m_next = 0;
//printf ( "%s:\n", mod );
p = col + 1;
}
else
p = 0;
}
else
p = buffer;
while ( p && *p && isblank(*p))
p++;
if ( p && *p ) {
char *end = &buffer [l-1];
char *deps;
char *dep;
char *next;
int ext = 0;
while ( isblank ( *end ) || ( *end == '\\' ))
end--;
do
{
next = strchr (p, ' ' );
if (next)
{
*next = 0;
next--;
}
else
next = end;
deps = strrchr ( p, '/' );
if ( !deps || ( deps < p )) {
deps = p;
while ( isblank ( *deps ))
deps++;
}
else
deps++;
#if defined(CONFIG_FEATURE_2_6_MODULES)
if ((k_version > 4) && ( *(next-2) == '.' ) && *(next-1) == 'k' &&
( *next == 'o' ))
ext = 3;
else
#endif
if (( *(next-1) == '.' ) && ( *next == 'o' ))
ext = 2;
/* Cope with blank lines */
if ((next-deps-ext+1) <= 0)
continue;
dep = bb_xstrndup ( deps, next - deps - ext + 1 );
current-> m_depcnt++;
current-> m_deparr = (char **) xrealloc ( current-> m_deparr,
sizeof ( char *) * current-> m_depcnt );
current-> m_deparr [current-> m_depcnt - 1] = dep;
//printf ( " %d) %s\n", current-> m_depcnt, current-> m_deparr [current-> m_depcnt -1] );
p = next + 2;
} while (next < end);
}
if ( buffer [l-1] == '\\' )
continuation_line = 1;
else
continuation_line = 0;
}
close ( fd );
// alias parsing is not 100% correct (no correct handling of continuation lines within an alias) !
#if defined(CONFIG_FEATURE_2_6_MODULES)
if (( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 )
#endif
if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 )
if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 )
return first;
continuation_line = 0;
while ( reads ( fd, buffer, sizeof( buffer ))) {
int l;
char *p;
p = strchr ( buffer, '#' );
if ( p )
*p = 0;
l = bb_strlen ( buffer );
while ( l && isspace ( buffer [l-1] )) {
buffer [l-1] = 0;
l--;
}
if ( l == 0 ) {
continuation_line = 0;
continue;
}
if ( !continuation_line ) {
if (( strncmp ( buffer, "alias", 5 ) == 0 ) && isspace ( buffer [5] )) {
char *alias, *mod;
if ( parse_tag_value ( buffer + 6, &alias, &mod )) {
// fprintf ( stderr, "ALIAS: '%s' -> '%s'\n", alias, mod );
if ( !current ) {
first = current = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
}
else {
current-> m_next = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
current = current-> m_next;
}
current-> m_name = bb_xstrdup ( alias );
current-> m_isalias = 1;
if (( strcmp ( mod, "off" ) == 0 ) || ( strcmp ( mod, "null" ) == 0 )) {
current-> m_depcnt = 0;
current-> m_deparr = 0;
}
else {
current-> m_depcnt = 1;
current-> m_deparr = xmalloc ( 1 * sizeof( char * ));
current-> m_deparr[0] = bb_xstrdup ( mod );
}
current-> m_next = 0;
}
}
else if (( strncmp ( buffer, "options", 7 ) == 0 ) && isspace ( buffer [7] )) {
char *mod, *opt;
if ( parse_tag_value ( buffer + 8, &mod, &opt )) {
struct dep_t *dt;
for ( dt = first; dt; dt = dt-> m_next ) {
if ( strcmp ( dt-> m_name, mod ) == 0 )
break;
}
if ( dt ) {
dt-> m_options = xrealloc ( dt-> m_options, bb_strlen( opt ) + 1 );
strcpy ( dt-> m_options, opt );
// fprintf ( stderr, "OPTION: '%s' -> '%s'\n", dt-> m_name, dt-> m_options );
}
}
}
}
}
close ( fd );
return first;
} }
/* return 1 = loaded, 0 = not loaded, -1 = can't tell */ #if (defined CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS)
static int already_loaded (const char *name)
{
int fd;
char buffer[4096];
fd = open ("/proc/modules", O_RDONLY);
if (fd < 0)
return -1;
while ( reads ( fd, buffer, sizeof( buffer ))) {
char *p;
p = strchr (buffer, ' ');
if (p) {
*p = 0;
if (strcmp (name, buffer) == 0) {
close (fd);
return 1;
}
}
}
close (fd);
return 0;
}
#ifdef CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
/* static char* parse_command_string( char* src, char **dst ); /* static char* parse_command_string( char* src, char **dst );
* src: pointer to string containing argument * src: pointer to string containing argument
* dst: pointer to where to store the parsed argument * dst: pointer to where to store the parsed argument
@ -410,8 +159,8 @@ static char *parse_command_string( char *src, char **dst )
return NULL; return NULL;
} }
/* Reached the start of an argument /* Reached the start of an argument
* By the way, we duplicate a little too much here :-/ but that's the easy way: * By the way, we duplicate a little too much
* cost effective wrt code, cost consumming wrt memory usage. */ * here but what is too much is freed later. */
*dst = tmp_str = bb_xstrdup( src ); *dst = tmp_str = bb_xstrdup( src );
/* Get to the end of that argument */ /* Get to the end of that argument */
while( ( *tmp_str != '\0' ) while( ( *tmp_str != '\0' )
@ -486,32 +235,340 @@ static char *parse_command_string( char *src, char **dst )
bb_error_msg_and_die( "unterminated (single or double) quote in options list: %s", src ); bb_error_msg_and_die( "unterminated (single or double) quote in options list: %s", src );
} }
*tmp_str = '\0'; *tmp_str = '\0';
*dst = xrealloc( *dst, strlen( *dst ) );
return src; return src;
} }
#endif /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS */ #endif /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
/*
* This function builds a list of dependency rules from /lib/modules/`uname -r\modules.dep.
* It then fills every modules and aliases with their default options, found by parsing
* modprobe.conf (or modules.conf, or conf.modules).
*/
static struct dep_t *build_dep ( void )
{
int fd;
struct utsname un;
struct dep_t *first = 0;
struct dep_t *current = 0;
char buffer[2048];
char *filename = buffer;
int continuation_line = 0;
int k_version;
k_version = 0;
if ( uname ( &un ))
bb_error_msg_and_die("can't determine kernel version");
// check for buffer overflow in following code
if ( bb_strlen ( un.release ) > ( sizeof( buffer ) - 64 )) {
return 0;
}
if (un.release[0] == '2') {
k_version = un.release[2] - '0';
}
strcpy ( filename, "/lib/modules/" );
strcat ( filename, un.release );
strcat ( filename, "/modules.dep" );
if (( fd = open ( filename, O_RDONLY )) < 0 ) {
/* Ok, that didn't work. Fall back to looking in /lib/modules */
if (( fd = open ( "/lib/modules/modules.dep", O_RDONLY )) < 0 ) {
return 0;
}
}
while ( reads ( fd, buffer, sizeof( buffer ))) {
int l = bb_strlen ( buffer );
char *p = 0;
while ( isspace ( buffer [l-1] )) {
buffer [l-1] = 0;
l--;
}
if ( l == 0 ) {
continuation_line = 0;
continue;
}
/* Is this a new module dep description? */
if ( !continuation_line ) {
/* find the dep begining */
char *col = strchr ( buffer, ':' );
char *dot = col;
if ( col ) {
/* This line is a dep description */
char *mods;
char *modpath;
char *mod;
/* Find the beginning of the module file name */
*col = 0;
mods = strrchr ( buffer, '/' );
if ( !mods )
mods = buffer; /* no path for this module */
else
mods++; /* there was a path for this module... */
/* find the path of the module */
modpath = strchr ( buffer, '/' ); /* ... and this is the path */
if ( !modpath )
modpath = buffer; /* module with no path */
/* find the end of the module name in the file name */
if ( ENABLE_FEATURE_2_6_MODULES &&
(k_version > 4) && ( *(col-3) == '.' ) &&
( *(col-2) == 'k' ) && ( *(col-1) == 'o' ) )
dot = col - 3;
else
if (( *(col-2) == '.' ) && ( *(col-1) == 'o' ))
dot = col - 2;
mod = bb_xstrndup ( mods, dot - mods );
/* enqueue new module */
if ( !current ) {
first = current = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
}
else {
current-> m_next = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
current = current-> m_next;
}
current-> m_name = mod;
current-> m_path = bb_xstrdup(modpath);
current-> m_options = NULL;
current-> m_isalias = 0;
current-> m_depcnt = 0;
current-> m_deparr = 0;
current-> m_next = 0;
p = col + 1;
}
else
/* this line is not a dep description */
p = 0;
}
else
/* It's a dep description continuation */
p = buffer;
while ( p && *p && isblank(*p))
p++;
/* p points to the first dependable module; if NULL, no dependable module */
if ( p && *p ) {
char *end = &buffer [l-1];
char *deps;
char *dep;
char *next;
int ext = 0;
while ( isblank ( *end ) || ( *end == '\\' ))
end--;
do
{
/* search the end of the dependency */
next = strchr (p, ' ' );
if (next)
{
*next = 0;
next--;
}
else
next = end;
/* find the begining of the module file name */
deps = strrchr ( p, '/' );
if ( !deps || ( deps < p )) {
deps = p;
while ( isblank ( *deps ))
deps++;
}
else
deps++;
/* find the end of the module name in the file name */
if ( ENABLE_FEATURE_2_6_MODULES &&
(k_version > 4) && ( *(next-2) == '.' ) &&
( *(next-1) == 'k' ) && ( *next == 'o' ) )
ext = 3;
else
if (( *(next-1) == '.' ) && ( *next == 'o' ))
ext = 2;
/* Cope with blank lines */
if ((next-deps-ext+1) <= 0)
continue;
dep = bb_xstrndup ( deps, next - deps - ext + 1 );
/* Add the new dependable module name */
current-> m_depcnt++;
current-> m_deparr = (char **) xrealloc ( current-> m_deparr,
sizeof ( char *) * current-> m_depcnt );
current-> m_deparr [current-> m_depcnt - 1] = dep;
p = next + 2;
} while (next < end);
}
/* is there other dependable module(s) ? */
if ( buffer [l-1] == '\\' )
continuation_line = 1;
else
continuation_line = 0;
}
close ( fd );
// alias parsing is not 100% correct (no correct handling of continuation lines within an alias) !
#if defined(CONFIG_FEATURE_2_6_MODULES)
if (( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 )
#endif
if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 )
if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 )
return first;
continuation_line = 0;
while ( reads ( fd, buffer, sizeof( buffer ))) {
int l;
char *p;
p = strchr ( buffer, '#' );
if ( p )
*p = 0;
l = bb_strlen ( buffer );
while ( l && isspace ( buffer [l-1] )) {
buffer [l-1] = 0;
l--;
}
if ( l == 0 ) {
continuation_line = 0;
continue;
}
if ( !continuation_line ) {
if (( strncmp ( buffer, "alias", 5 ) == 0 ) && isspace ( buffer [5] )) {
char *alias, *mod;
if ( parse_tag_value ( buffer + 6, &alias, &mod )) {
/* handle alias as a module dependent on the aliased module */
if ( !current ) {
first = current = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
}
else {
current-> m_next = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
current = current-> m_next;
}
current-> m_name = bb_xstrdup ( alias );
current-> m_isalias = 1;
if (( strcmp ( mod, "off" ) == 0 ) || ( strcmp ( mod, "null" ) == 0 )) {
current-> m_depcnt = 0;
current-> m_deparr = 0;
}
else {
current-> m_depcnt = 1;
current-> m_deparr = xmalloc ( 1 * sizeof( char * ));
current-> m_deparr[0] = bb_xstrdup ( mod );
}
current-> m_next = 0;
}
}
else if (( strncmp ( buffer, "options", 7 ) == 0 ) && isspace ( buffer [7] )) {
char *mod, *opt;
/* split the line in the module/alias name, and options */
if ( parse_tag_value ( buffer + 8, &mod, &opt )) {
struct dep_t *dt;
/* find the corresponding module */
for ( dt = first; dt; dt = dt-> m_next ) {
if ( strcmp ( dt-> m_name, mod ) == 0 )
break;
}
if ( dt ) {
if ( CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS ) {
char* new_opt = NULL;
while( ( opt = parse_command_string( opt, &new_opt ) ) ) {
dt-> m_options = append_option( dt-> m_options, new_opt );
}
} else {
dt-> m_options = append_option( dt-> m_options, opt );
}
}
}
}
}
}
close ( fd );
return first;
}
/* return 1 = loaded, 0 = not loaded, -1 = can't tell */
static int already_loaded (const char *name)
{
int fd;
char buffer[4096];
fd = open ("/proc/modules", O_RDONLY);
if (fd < 0)
return -1;
while ( reads ( fd, buffer, sizeof( buffer ))) {
char *p;
p = strchr (buffer, ' ');
if (p) {
*p = 0;
for( p = buffer; ENABLE_FEATURE_2_6_MODULES && *p; p++ ) {
*p = ((*p)=='-')?'_':*p;
}
if (strcmp (name, buffer) == 0) {
close (fd);
return 1;
}
}
}
close (fd);
return 0;
}
static int mod_process ( struct mod_list_t *list, int do_insert ) static int mod_process ( struct mod_list_t *list, int do_insert )
{ {
int rc = 0; int rc = 0;
#ifdef CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
char **argv = NULL; char **argv = NULL;
char *opts; struct mod_opt_t *opts;
#ifdef CONFIG_FEATURE_CLEAN_UP int argc_malloc; /* never used when CONFIG_FEATURE_CLEAN_UP not defined */
int argc_malloc;
#endif
#else /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
char *argv[10];
#endif
int argc; int argc;
while ( list ) { while ( list ) {
argc = 0; argc = 0;
#ifdef CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS if( ENABLE_FEATURE_CLEAN_UP )
#ifdef CONFIG_FEATURE_CLEAN_UP
argc_malloc = 0; argc_malloc = 0;
#endif /* If CONFIG_FEATURE_CLEAN_UP is not defined, then we leak memory
argv = (char**) malloc( 6 * sizeof( char* ) ); /* enough for minimal insmod (5 args + NULL) or rmmod (3 args + NULL) */ * each time we allocate memory for argv.
#endif * But it is (quite) small amounts of memory that leak each
* time a module is loaded, and it is reclaimed when modprobe
* exits anyway (even when standalone shell?).
* This could become a problem when loading a module with LOTS of
* dependencies, with LOTS of options for each dependencies, with
* very little memory on the target... But in that case, the module
* would not load because there is no more memory, so there's no
* problem. */
/* enough for minimal insmod (5 args + NULL) or rmmod (3 args + NULL) */
argv = (char**) malloc( 6 * sizeof( char* ) );
if ( do_insert ) { if ( do_insert ) {
if (already_loaded (list->m_name) != 1) { if (already_loaded (list->m_name) != 1) {
argv[argc++] = "insmod"; argv[argc++] = "insmod";
@ -524,20 +581,16 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
else if(verbose) /* verbose and quiet are mutually exclusive */ else if(verbose) /* verbose and quiet are mutually exclusive */
argv[argc++] = "-v"; argv[argc++] = "-v";
argv[argc++] = list-> m_path; argv[argc++] = list-> m_path;
#ifdef CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS if( ENABLE_FEATURE_CLEAN_UP )
#ifdef CONFIG_FEATURE_CLEAN_UP
argc_malloc = argc; argc_malloc = argc;
#endif
opts = list-> m_options; opts = list-> m_options;
while( ( opts = parse_command_string( opts, &(argv[argc]) ) ) != NULL ) { while( opts ) {
/* Increase the argv array by 1 */ /* Add one more option */
argc++; argc++;
argv = (char**) xrealloc( argv, ( argc + 1 ) * sizeof( char* ) ); argv = (char**) xrealloc( argv, ( argc + 1 ) * sizeof( char* ) );
argv[argc-1] = opts-> m_opt_val;
opts = opts-> m_next;
} }
#else /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
if (list-> m_options)
argv[argc++] = list-> m_options;
#endif /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
} }
} else { } else {
/* modutils uses short name for removal */ /* modutils uses short name for removal */
@ -546,19 +599,15 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
if (do_syslog) if (do_syslog)
argv[argc++] = "-s"; argv[argc++] = "-s";
argv[argc++] = list->m_name; argv[argc++] = list->m_name;
#if ( defined CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS ) && ( defined CONFIG_FEATURE_CLEAN_UP ) if( ENABLE_FEATURE_CLEAN_UP )
argc_malloc = argc; argc_malloc = argc;
#endif
} }
} }
argv[argc] = NULL; argv[argc] = NULL;
if (argc) { if (argc) {
if (verbose) { if (verbose) {
int i; printf("%s module %s\n", do_insert?"Loading":"Unloading", list-> m_name );
printf("argc=%d\n", argc );
for (i=0; i<argc; i++)
printf("argv[%02d]=\"%s\"\n", i, argv[i]);
} }
if (!show_only) { if (!show_only) {
int rc2 = 0; int rc2 = 0;
@ -589,51 +638,48 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
rc = 0; /* success if remove any mod */ rc = 0; /* success if remove any mod */
} }
} }
#if ( defined CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS ) && ( defined CONFIG_FEATURE_CLEAN_UP ) if( ENABLE_FEATURE_CLEAN_UP )
/* the last value in the array has index == argc, but /* the last value in the array has index == argc, but
* it is the terminatign NULL, so we must not free it. */ * it is the terminating NULL, so we must not free it. */
while( argc_malloc < argc ) { while( argc_malloc < argc ) {
free( argv[argc_malloc++] ); free( argv[argc_malloc++] );
} }
} }
if( ENABLE_FEATURE_CLEAN_UP ) {
free( argv ); free( argv );
/* If CONFIG_FEATURE_CLEAN_UP is not defined, then we leak memory
* here. But it is (quite) small amounts of memory that leak each
* time a module is loaded, and it is reclaimed when modprobe
* exits anyway.
* This could become a problem when loading a module with LOTS of
* dependencies, with LOTS of options for each dependencies, with
* very little memory on the target... But in that case, the module
* would not load because there is no more memory, so there's no
* problem. Hmm, wait... Is this true, whatever the allocation policy? */
argv = NULL; argv = NULL;
#else /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS && CONFIG_FEATURE_CLEAN_UP */
} }
#endif
list = do_insert ? list-> m_prev : list-> m_next; list = do_insert ? list-> m_prev : list-> m_next;
} }
return (show_only) ? 0 : rc; return (show_only) ? 0 : rc;
} }
/*
* Builds the dependency list (aka stack) of a module.
* head: the highest module in the stack (last to insmod, first to rmmod)
* tail: the lowest module in the stack (first to insmod, last to rmmod)
*/
static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t **tail ) static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t **tail )
{ {
struct mod_list_t *find; struct mod_list_t *find;
struct dep_t *dt; struct dep_t *dt;
char *opt = 0; struct mod_opt_t *opt = 0;
char *path = 0; char *path = 0;
// check dependencies // check dependencies
for ( dt = depend; dt; dt = dt-> m_next ) { for ( dt = depend; dt; dt = dt-> m_next ) {
if ( strcmp ( dt-> m_name, mod ) == 0) { if ( strcmp ( dt-> m_name, mod ) == 0) {
mod = dt-> m_name;
path = dt-> m_path;
opt = dt-> m_options;
break; break;
} }
} }
if( !dt ) {
bb_error_msg ("module %s not found.", mod);
return;
}
// resolve alias names // resolve alias names
while ( dt && dt-> m_isalias ) { while ( dt-> m_isalias ) {
if ( dt-> m_depcnt == 1 ) { if ( dt-> m_depcnt == 1 ) {
struct dep_t *adt; struct dep_t *adt;
@ -642,23 +688,29 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
break; break;
} }
if ( adt ) { if ( adt ) {
/* This is the module we are aliased to */
struct mod_opt_t *opts = dt-> m_options;
/* Option of the alias are appended to the options of the module */
while( opts ) {
adt-> m_options = append_option( adt-> m_options, opts-> m_opt_val );
opts = opts-> m_next;
}
dt = adt; dt = adt;
mod = dt-> m_name;
path = dt-> m_path;
if ( !opt )
opt = dt-> m_options;
} }
else else {
return;
}
else
return;
}
if ( !path ) {
bb_error_msg ("module %s not found.", mod); bb_error_msg ("module %s not found.", mod);
return; return;
} }
}
else {
bb_error_msg ("Bad alias %s", dt-> m_name);
return;
}
}
mod = dt-> m_name;
path = dt-> m_path;
opt = dt-> m_options;
// search for duplicates // search for duplicates
for ( find = *head; find; find = find-> m_next ) { for ( find = *head; find; find = find-> m_next ) {
@ -699,6 +751,7 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
if ( dt ) { if ( dt ) {
int i; int i;
/* Add all dependable module for that new module */
for ( i = 0; i < dt-> m_depcnt; i++ ) for ( i = 0; i < dt-> m_depcnt; i++ )
check_dep ( dt-> m_deparr [i], head, tail ); check_dep ( dt-> m_deparr [i], head, tail );
} }
@ -714,24 +767,12 @@ static int mod_insert ( char *mod, int argc, char **argv )
check_dep ( mod, &head, &tail ); check_dep ( mod, &head, &tail );
if ( head && tail ) { if ( head && tail ) {
#if defined(CONFIG_FEATURE_2_6_MODULES) if( argc ) {
if ( argc ) {
int i; int i;
int l = 0;
// append module args // append module args
for ( i = 0; i < argc; i++ ) for ( i = 0; i < argc; i++ )
l += ( bb_strlen ( argv [i] ) + 1 ); head->m_options = append_option( head->m_options, argv[i] );
head-> m_options = xrealloc ( head-> m_options, l + 1 );
head-> m_options [0] = 0;
for ( i = 0; i < argc; i++ ) {
strcat ( head-> m_options, argv [i] );
strcat ( head-> m_options, " " );
} }
}
#endif
// process tail ---> head // process tail ---> head
rc = mod_process ( tail, 1 ); rc = mod_process ( tail, 1 );
@ -766,6 +807,7 @@ static int mod_remove ( char *mod )
extern int modprobe_main(int argc, char** argv) extern int modprobe_main(int argc, char** argv)
{ {
int opt; int opt;
int rc = EXIT_SUCCESS;
int remove_opt = 0; int remove_opt = 0;
autoclean = show_only = quiet = do_syslog = verbose = 0; autoclean = show_only = quiet = do_syslog = verbose = 0;
@ -814,7 +856,6 @@ extern int modprobe_main(int argc, char** argv)
bb_error_msg_and_die ( "could not parse modules.dep\n" ); bb_error_msg_and_die ( "could not parse modules.dep\n" );
if (remove_opt) { if (remove_opt) {
int rc = EXIT_SUCCESS;
do { do {
if (mod_remove ( optind < argc ? if (mod_remove ( optind < argc ?
bb_xstrdup (argv [optind]) : NULL )) { bb_xstrdup (argv [optind]) : NULL )) {
@ -823,15 +864,15 @@ extern int modprobe_main(int argc, char** argv)
rc = EXIT_FAILURE; rc = EXIT_FAILURE;
} }
} while ( ++optind < argc ); } while ( ++optind < argc );
} else {
return rc;
}
if (optind >= argc) if (optind >= argc)
bb_error_msg_and_die ( "No module or pattern provided\n" ); bb_error_msg_and_die ( "No module or pattern provided\n" );
if ( mod_insert ( bb_xstrdup ( argv [optind] ), argc - optind - 1, argv + optind + 1 )) if ( mod_insert ( bb_xstrdup ( argv [optind] ), argc - optind - 1, argv + optind + 1 ))
bb_error_msg_and_die ( "failed to load module %s", argv [optind] ); bb_error_msg_and_die ( "failed to load module %s", argv [optind] );
}
return EXIT_SUCCESS; /* Here would be a good place to free up memory allocated during the dependencies build. */
return rc;
} }