[Upstream] iptables: Add missing function item of xtables to match iptables 1.6 81/134781/2
authorSaurav Babu <saurav.babu@samsung.com>
Tue, 20 Jun 2017 04:14:17 +0000 (09:44 +0530)
committerseonah moon <seonah1.moon@samsung.com>
Thu, 6 Jul 2017 05:33:47 +0000 (05:33 +0000)
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>
src/iptables.c

index c65f9ef..a5774ad 100755 (executable)
@@ -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,