git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001
   2 From: Wu Zheng <wu.zheng@intel.com>
   3 Date: Thu, 28 Jan 2016 18:04:17 +0800
   4 Subject: [PATCH] iptables: Add missing function item of xtables to match
   5  iptables 1.6
   6
   7 The struct of xtables_globals has been modified in iptables 1.6.
   8 If connman runs with iptables 1.6, it can crash.
   9
  10 Program received signal SIGSEGV, Segmentation fault.
  11 0x00000000 in ?? ()
  12 0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11
  13 0xb7deac1c in ?? () from /usr/lib/libxtables.so.11
  14 0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11
  15
  16 The the missing function item of xtables is added to xtables_globals.
  17
  18 Upstream-Status: Backport
  19
  20 Signed-off-by: Maxin B. John <maxin.john@intel.com>
  21 Signed-off-by: Wu Zheng <wu.zheng@intel.com>
  22 ---
  23  src/iptables.c | 3 +++
  24  1 file changed, 3 insertions(+)
  25
  26 diff --git a/src/iptables.c b/src/iptables.c
  27 index 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 --
  41 2.4.0
  42