aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-03-13 23:43:26 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-03-13 23:43:26 +0000
commit3b5c9b88852b3121563dec96068bb59e32a2f4dd (patch)
treeb20f85ce76286f48dab9f2d35a748dcd13e33ef3 /modutils
parent1f0b95f1473bca7282fd8189f11b81af4e7f6b6a (diff)
downloadbusybox-3b5c9b88852b3121563dec96068bb59e32a2f4dd.tar.gz
busybox-3b5c9b88852b3121563dec96068bb59e32a2f4dd.tar.bz2
insmod/modprobe: do not pass NULL to kernel as module parameter
Diffstat (limited to 'modutils')
-rw-r--r--modutils/modutils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 5a4ba84e7..405785ff5 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -115,6 +115,9 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
char *image;
int rc = ENOENT;
+ if (!options)
+ options = "";
+
#if ENABLE_FEATURE_2_4_MODULES
if (get_linux_version_code() < KERNEL_VERSION(2,6,0))
return bb_init_module_24(filename, options);
@@ -123,10 +126,9 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
/* Use the 2.6 way */
image = xmalloc_open_zipped_read_close(filename, &len);
if (image) {
+ rc = 0;
if (init_module(image, len, options) != 0)
rc = errno;
- else
- rc = 0;
free(image);
}