From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 24 Feb 2010 01:59:32 +0000 (+0000)
Subject: iptables: fix a segfault when iptables tries to use modprobe, force it to use insmod
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0ab4d7e848ead11fcc85c04834519861682cd9ef;p=openwrt%2Fstaging%2Flinusw.git

iptables: fix a segfault when iptables tries to use modprobe, force it to use insmod

SVN-Revision: 19827
---

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 20e4b315ca..68ccc76282 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -254,6 +254,10 @@ TARGET_CPPFLAGS := \
 	-I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \
 	$(TARGET_CPPFLAGS)
 
+TARGET_CFLAGS := \
+	$(TARGET_CFLAGS) \
+	-DFORCE_MODPROBE_PROGRAM="\\\"/sbin/insmod\\\""
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-devel \
diff --git a/package/iptables/patches/020-iptables-force-modprobe-util.patch b/package/iptables/patches/020-iptables-force-modprobe-util.patch
new file mode 100644
index 0000000000..32c9fcd515
--- /dev/null
+++ b/package/iptables/patches/020-iptables-force-modprobe-util.patch
@@ -0,0 +1,20 @@
+--- a/xtables.c
++++ b/xtables.c
+@@ -285,6 +285,7 @@ void *xtables_realloc(void *ptr, size_t 
+ 
+ static char *get_modprobe(void)
+ {
++#ifndef FORCE_MODPROBE_PROGRAM
+ 	int procfile;
+ 	char *ret;
+ 
+@@ -309,6 +310,9 @@ static char *get_modprobe(void)
+ 	free(ret);
+ 	close(procfile);
+ 	return NULL;
++#else
++	return strdup(FORCE_MODPROBE_PROGRAM);
++#endif
+ }
+ 
+ int xtables_insmod(const char *modname, const char *modprobe, bool quiet)