summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-01-28 14:37:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 11:37:04 +0000
commit51cebbfdd256f2cd47155775fbd6c4e7411f492d (patch)
treebeb6b48a1198e994e070b510cf8a9ff4f4f1d6af
parent7f54fab99392d0e875a3b6a400fd3c024bd69d00 (diff)
downloadpoky-51cebbfdd256f2cd47155775fbd6c4e7411f492d.tar.gz
connman: fix crash with iptables 1.6
The struct of xtables_globals has been modified in iptables 1.6. If connman runs with iptables 1.6, it can crash. Program received signal SIGSEGV, Segmentation fault. 0x00000000 in ?? () 0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11 0xb7deac1c in ?? () from /usr/lib/libxtables.so.11 0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11 The the missing function item of xtables is added to xtables_globals. It can fix the above issue. (From OE-Core rev: ae64dc3af8c49ef53ab3e847f7761cf5e59c5998) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch42
-rw-r--r--meta/recipes-connectivity/connman/connman_1.31.bb1
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch b/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch
new file mode 100644
index 0000000000..1b5a3e4407
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch
@@ -0,0 +1,42 @@
1From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001
2From: Wu Zheng <wu.zheng@intel.com>
3Date: Thu, 28 Jan 2016 18:04:17 +0800
4Subject: [PATCH] iptables: Add missing function item of xtables to match
5 iptables 1.6
6
7The struct of xtables_globals has been modified in iptables 1.6.
8If connman runs with iptables 1.6, it can crash.
9
10Program received signal SIGSEGV, Segmentation fault.
110x00000000 in ?? ()
120xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11
130xb7deac1c in ?? () from /usr/lib/libxtables.so.11
140xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11
15
16The the missing function item of xtables is added to xtables_globals.
17
18Upstream-Status: Backport
19
20Signed-off-by: Maxin B. John <maxin.john@intel.com>
21Signed-off-by: Wu Zheng <wu.zheng@intel.com>
22---
23 src/iptables.c | 3 +++
24 1 file changed, 3 insertions(+)
25
26diff --git a/src/iptables.c b/src/iptables.c
27index bc0c763..5ef757a 100644
28--- a/src/iptables.c
29+++ b/src/iptables.c
30@@ -1566,6 +1566,9 @@ struct xtables_globals iptables_globals = {
31 .option_offset = 0,
32 .opts = iptables_opts,
33 .orig_opts = iptables_opts,
34+#if XTABLES_VERSION_CODE > 10
35+ .compat_rev = xtables_compatible_revision,
36+#endif
37 };
38
39 static struct xtables_target *prepare_target(struct connman_iptables *table,
40--
412.4.0
42
diff --git a/meta/recipes-connectivity/connman/connman_1.31.bb b/meta/recipes-connectivity/connman/connman_1.31.bb
index 7b6bcfb0b1..e71d2218a2 100644
--- a/meta/recipes-connectivity/connman/connman_1.31.bb
+++ b/meta/recipes-connectivity/connman/connman_1.31.bb
@@ -5,6 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
5 file://0001-Detect-backtrace-API-availability-before-using-it.patch \ 5 file://0001-Detect-backtrace-API-availability-before-using-it.patch \
6 file://0002-resolve-musl-does-not-implement-res_ninit.patch \ 6 file://0002-resolve-musl-does-not-implement-res_ninit.patch \
7 file://0003-Fix-header-inclusions-for-musl.patch \ 7 file://0003-Fix-header-inclusions-for-musl.patch \
8 file://0001-iptables-Add-missing-function-item-of-xtables-to-mat.patch \
8 file://connman \ 9 file://connman \
9 " 10 "
10SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c" 11SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c"