summaryrefslogtreecommitdiffstats
path: root/iptables
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-12-30 01:45:44 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2013-12-30 23:50:21 +0100
commit5a1b519d1e26767fa1f0de15b0f7e125531a1719 (patch)
tree1b632a609eb3b835be8a48d022ef327d35ec7a87 /iptables
parent9c541721d318598db45986ee2fd61491fadb53d0 (diff)
xtables: fix crash due to using wrong globals
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables')
-rw-r--r--iptables/xtables.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/iptables/xtables.c b/iptables/xtables.c
index d1a91723..d6045906 100644
--- a/iptables/xtables.c
+++ b/iptables/xtables.c
@@ -623,11 +623,11 @@ static void command_jump(struct iptables_command_state *cs)
xs_init_target(cs->target);
if (cs->target->x6_options != NULL)
- opts = xtables_options_xfrm(iptables_globals.orig_opts, opts,
+ opts = xtables_options_xfrm(xtables_globals.orig_opts, opts,
cs->target->x6_options,
&cs->target->option_offset);
else
- opts = xtables_merge_options(iptables_globals.orig_opts, opts,
+ opts = xtables_merge_options(xtables_globals.orig_opts, opts,
cs->target->extra_opts,
&cs->target->option_offset);
if (opts == NULL)
@@ -661,10 +661,10 @@ static void command_match(struct iptables_command_state *cs)
return;
/* Merge options for non-cloned matches */
if (m->x6_options != NULL)
- opts = xtables_options_xfrm(iptables_globals.orig_opts, opts,
+ opts = xtables_options_xfrm(xtables_globals.orig_opts, opts,
m->x6_options, &m->option_offset);
else if (m->extra_opts != NULL)
- opts = xtables_merge_options(iptables_globals.orig_opts, opts,
+ opts = xtables_merge_options(xtables_globals.orig_opts, opts,
m->extra_opts, &m->option_offset);
if (opts == NULL)
xtables_error(OTHER_PROBLEM, "can't alloc memory!");
@@ -1048,7 +1048,7 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table)
exit_tryhelp(2);
default:
- if (command_default(&cs, &iptables_globals) == 1)
+ if (command_default(&cs, &xtables_globals) == 1)
/* cf. ip6tables.c */
continue;
break;