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

Fix bug 1017, which reports that insmod segfaults when /lib/modules doesn't

Browse Source 
exist.  Also allow early search termination (per the comments).
This commit is contained in:
Matt Kraai 2000-08-01 18:16:56 +00:00
parent 98bbd688a8
commit 0f8f7b8a35
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
insmod.c
View File

@ -70,7 +70,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
#define MODUTILS_MODULE_H 1 #define MODUTILS_MODULE_H 1
#ident "$Id: insmod.c,v 1.19 2000/07/19 17:35:54 andersen Exp $" #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels. /* 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 We do not use the kernel headers directly because we do not wish
@ -276,7 +276,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H #ifndef MODUTILS_OBJ_H
#define MODUTILS_OBJ_H 1 #define MODUTILS_OBJ_H 1
#ident "$Id: insmod.c,v 1.19 2000/07/19 17:35:54 andersen Exp $" #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -2694,7 +2694,7 @@ extern int insmod_main( int argc, char **argv)
if ((fp = fopen(*argv, "r")) == NULL) { if ((fp = fopen(*argv, "r")) == NULL) {
/* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */
if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE,
findNamedModule, 0, m_fullName) == TRUE) findNamedModule, 0, m_fullName) == FALSE)
{ {
if (m_filename[0] == '\0' if (m_filename[0] == '\0'
|| ((fp = fopen(m_filename, "r")) == NULL)) || ((fp = fopen(m_filename, "r")) == NULL))
@ -2702,7 +2702,8 @@ extern int insmod_main( int argc, char **argv)
errorMsg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); errorMsg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES);
exit(FALSE); exit(FALSE);
} }
} } else
fatalError("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES);
} else } else
memcpy(m_filename, *argv, strlen(*argv)); memcpy(m_filename, *argv, strlen(*argv));

9
modutils/insmod.c
View File

@ -70,7 +70,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
#define MODUTILS_MODULE_H 1 #define MODUTILS_MODULE_H 1
#ident "$Id: insmod.c,v 1.19 2000/07/19 17:35:54 andersen Exp $" #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels. /* 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 We do not use the kernel headers directly because we do not wish
@ -276,7 +276,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H #ifndef MODUTILS_OBJ_H
#define MODUTILS_OBJ_H 1 #define MODUTILS_OBJ_H 1
#ident "$Id: insmod.c,v 1.19 2000/07/19 17:35:54 andersen Exp $" #ident "$Id: insmod.c,v 1.20 2000/08/01 18:16:56 kraai Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -2694,7 +2694,7 @@ extern int insmod_main( int argc, char **argv)
if ((fp = fopen(*argv, "r")) == NULL) { if ((fp = fopen(*argv, "r")) == NULL) {
/* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */
if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE,
findNamedModule, 0, m_fullName) == TRUE) findNamedModule, 0, m_fullName) == FALSE)
{ {
if (m_filename[0] == '\0' if (m_filename[0] == '\0'
|| ((fp = fopen(m_filename, "r")) == NULL)) || ((fp = fopen(m_filename, "r")) == NULL))
@ -2702,7 +2702,8 @@ extern int insmod_main( int argc, char **argv)
errorMsg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); errorMsg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES);
exit(FALSE); exit(FALSE);
} }
} } else
fatalError("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES);
} else } else
memcpy(m_filename, *argv, strlen(*argv)); memcpy(m_filename, *argv, strlen(*argv));

2
utility.c
View File

@ -641,7 +641,7 @@ int recursiveAction(const char *fileName,
status = status =
recursiveAction(nextFile, TRUE, followLinks, depthFirst, recursiveAction(nextFile, TRUE, followLinks, depthFirst,
fileAction, dirAction, userData); fileAction, dirAction, userData);
if (status < 0) { if (status == FALSE) {
closedir(dir); closedir(dir);
return FALSE; return FALSE;
} }