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

insmod/modprobe: do not pass NULL to kernel as module parameter

Browse Source
This commit is contained in:
Denis Vlasenko 2009-03-13 23:43:26 +00:00
parent 1f0b95f147
commit 3b5c9b8885
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modutils/modutils.c
View File

@ -115,6 +115,9 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
char *image; char *image;
int rc = ENOENT; int rc = ENOENT;
if (!options)
options = "";
#if ENABLE_FEATURE_2_4_MODULES #if ENABLE_FEATURE_2_4_MODULES
if (get_linux_version_code() < KERNEL_VERSION(2,6,0)) if (get_linux_version_code() < KERNEL_VERSION(2,6,0))
return bb_init_module_24(filename, options); 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 */ /* Use the 2.6 way */
image = xmalloc_open_zipped_read_close(filename, &len); image = xmalloc_open_zipped_read_close(filename, &len);
if (image) { if (image) {
rc = 0;
if (init_module(image, len, options) != 0) if (init_module(image, len, options) != 0)
rc = errno; rc = errno;
else
rc = 0;
free(image); free(image);
} }