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

Steven Seeger writes:

Browse Source 
Hey guys. I've found a bug in modprobe where it generates bad strings and
makes sytem calls with them. The following patch seems to have fixed the
problem. It is rather inherited elsewhere, as there seems to be incorrect
entries in the list which results in more dependencies than really exist for
a given call to mod_process. But, this patch prevents the bad text from
going to the screen. You will notice there are cases where lcmd goes
unmodified before calling system.

Please consider the following patch.

Thanks.

-Steve
This commit is contained in:
Eric Andersen 2003-11-14 02:49:19 +00:00
parent 8211db5af0
commit 61b038accc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modutils/modprobe.c
View File

@ -352,6 +352,7 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
int rc = 1; int rc = 1;
while ( list ) { while ( list ) {
*lcmd = '\0';
if ( do_insert ) { if ( do_insert ) {
if (already_loaded (list->m_module) != 1) if (already_loaded (list->m_module) != 1)
snprintf ( lcmd, sizeof( lcmd ) - 1, "insmod %s %s %s %s %s", do_syslog ? "-s" : "", autoclean ? "-k" : "", quiet ? "-q" : "", list-> m_module, list-> m_options ? list-> m_options : "" ); snprintf ( lcmd, sizeof( lcmd ) - 1, "insmod %s %s %s %s %s", do_syslog ? "-s" : "", autoclean ? "-k" : "", quiet ? "-q" : "", list-> m_module, list-> m_options ? list-> m_options : "" );
@ -362,7 +363,7 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
if ( verbose ) if ( verbose )
printf ( "%s\n", lcmd ); printf ( "%s\n", lcmd );
if ( !show_only ) { if ( !show_only && *lcmd) {
int rc2 = system ( lcmd ); int rc2 = system ( lcmd );
if (do_insert) rc = rc2; /* only last module matters */ if (do_insert) rc = rc2; /* only last module matters */
else if (!rc2) rc = 0; /* success if remove any mod */ else if (!rc2) rc = 0; /* success if remove any mod */