Christian Grigis, christian.grigis at smartdata dot ch writes:

Hello everyone,

Busybox's insmod fails to locate a module when that module is the only one
existing in the /lib/modules directory (with a unique name).

Example:

# find /lib/modules/ -type f
/lib/modules/kernel/drivers/char/bios.o
# insmod bios
insmod: bios.o: no module by that name found
# touch /lib/modules/dummy
# find /lib/modules/ -type f
/lib/modules/kernel/drivers/char/bios.o
/lib/modules/dummy
# insmod bios
Using /lib/modules/kernel/drivers/char/bios.o

As long as there is another file in the /lib/modules directory, insmod
finds it OK.

I tracked the problem down to 'check_module_name_match()' in insmod.c:

It returns TRUE when a match is found, and FALSE otherwise. In the case
where there is only one module in the /lib/modules directory (or more that
one module, but all with the same name), 'recursive_action()' will return
TRUE and we end up on line 4196 in 'insmod.c' which returns an error.
[The reason it works with more than one module with different
names is that in this case there will always be one not matching,
'recursive_action()' will return FALSE and we end up in line 4189.]

Now, from the implementation of 'recursive_action()' and from other
usages of it (tar.c, etc.), it seems to me that FALSE should be returned
to indicate that we want to stop the recursion, so TRUE and FALSE should
be inverted in 'check_module_name_match()'.

At the same time, 'recursive_action()' continues to recurse even after
the recursive call has returned FALSE; again in my understanding and
other usages of it, we can safely stop recursing at this point.

Here is my patch against 1.00-pre8:

diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index d27629829f5f0a1638a2a6d40848bc2692c5cdaf..72371963fe8216644ed3790d1dd9d7ca4b72f611 100644 (file)
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -100,7 +100,7 @@ int recursive_action(const char *fileName,
                        return FALSE;
                }
                status = TRUE;
-               while ((next = readdir(dir)) != NULL) {
+               while (status && (next = readdir(dir)) != NULL) {
                        char *nextFile;
 
                        nextFile = concat_subpath_file(fileName, next->d_name);

diff --git a/modutils/insmod.c b/modutils/insmod.c
index 455b1c10c4dd978a78b8b44530a90fab12156a43..d788a76c3010bb279042231b57fe5dd300094a5a 100644 (file)
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -282,7 +282,7 @@ extern int insmod_ng_main( int argc, char **argv);
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.115 2004/03/19 12:17:04 andersen Exp $"
+#ident "$Id: insmod.c,v 1.116 2004/04/06 11:56:26 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -503,7 +503,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.115 2004/03/19 12:17:04 andersen Exp $"
+#ident "$Id: insmod.c,v 1.116 2004/04/06 11:56:26 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -811,11 +811,11 @@ static int check_module_name_match(const char *filename, struct stat *statbuf,
                        free(tmp1);
                        /* Stop searching if we find a match */
                        m_filename = bb_xstrdup(filename);
-                       return (TRUE);
+                       return (FALSE);
                }
                free(tmp1);
        }
-       return (FALSE);
+       return (TRUE);
 }