From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 26 Feb 2015 21:29:57 +0000 (+0000)
Subject: BB: ubox: fix segmentation fault in insmod
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d37d07b68d4b45beb253b15f74c21f8c9329555b;p=openwrt%2Fsvn-archive%2Fopenwrt.git

BB: ubox: fix segmentation fault in insmod

Fix segfault in kmodloader insmod mode due to uninitialized module
directory list.

Apply the required fix as patch for now since we don't have the
ulog infrastructure in BB (yet) required for the git head of ubox.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44550
---

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index 471afd6dc0..2d7ed29741 100644
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_VERSION:=2015-02-25
+PKG_VERSION:=2015-02-25.1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
diff --git a/package/system/ubox/patches/100-insmod-segfault.patch b/package/system/ubox/patches/100-insmod-segfault.patch
new file mode 100644
index 0000000000..df010d1a66
--- /dev/null
+++ b/package/system/ubox/patches/100-insmod-segfault.patch
@@ -0,0 +1,12 @@
+--- a/kmodloader.c
++++ b/kmodloader.c
+@@ -605,6 +605,9 @@ static int main_insmod(int argc, char **
+ 		cur += sprintf(cur, "%s", argv[i]);
+ 	}
+ 
++	if (init_module_folders())
++		return -1;
++
+ 	if (get_module_path(argv[1])) {
+ 		name = argv[1];
+ 	} else if (!get_module_path(name)) {