summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaurav Babu <saurav.babu@samsung.com>2017-06-20 09:44:17 +0530
committerseonah moon <seonah1.moon@samsung.com>2017-07-06 05:33:47 +0000
commita5dc565b80c2abcd6fb909f41611bbcc78a42c18 (patch)
tree7d104eec715f901f2bf4b05eed1337bfd1b60293
parent2cc28fa0b1818eef6e7d001decfc1aa37c966019 (diff)
downloadconnman-a5dc565b80c2abcd6fb909f41611bbcc78a42c18.tar.gz
connman-a5dc565b80c2abcd6fb909f41611bbcc78a42c18.tar.bz2
connman-a5dc565b80c2abcd6fb909f41611bbcc78a42c18.zip
[Upstream] iptables: Add missing function item of xtables to match 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. Commit ID: acea08a0e4234a4c1a87bedc087c73ff36de0c7b Change-Id: I670e100d816636d705d967ba69b3cb72c26d889e Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
-rwxr-xr-xsrc/iptables.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/iptables.c b/src/iptables.c
index c65f9efc..a5774ada 100755
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -1546,6 +1546,9 @@ struct xtables_globals iptables_globals = {
.option_offset = 0,
.opts = iptables_opts,
.orig_opts = iptables_opts,
+#if XTABLES_VERSION_CODE > 10
+ .compat_rev = xtables_compatible_revision,
+#endif
};
static struct xtables_target *prepare_target(struct connman_iptables *table,