From 878af3117f68c2f8d6b3d6582e50c6cef521f6f7 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 26 Feb 2015 21:29:57 +0000
Subject: [PATCH] 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>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@44550 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/system/ubox/Makefile                         |  2 +-
 .../system/ubox/patches/100-insmod-segfault.patch    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 package/system/ubox/patches/100-insmod-segfault.patch

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index 471afd6..2d7ed29 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 0000000..df010d1
--- /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)) {