commit 5a1b519d1e26767fa1f0de15b0f7e125531a1719
author Pablo Neira Ayuso <pablo@netfilter.org> Sun Dec 30 01:45:44 2012 +0100
committer Pablo Neira Ayuso <pablo@netfilter.org> Mon Dec 30 23:50:21 2013 +0100
tree 1b632a609eb3b835be8a48d022ef327d35ec7a87
parent 9c541721d318598db45986ee2fd61491fadb53d0

xtables: fix crash due to using wrong globals

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

iptables/xtables.c

diff --git a/iptables/xtables.c b/iptables/xtables.c
index d1a9172..d604590 100644
--- a/iptables/xtables.c
+++ b/iptables/xtables.c
@@ -623,11 +623,11 @@
 	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 @@
 		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 @@
 			exit_tryhelp(2);
 
 		default:
-			if (command_default(&cs, &iptables_globals) == 1)
+			if (command_default(&cs, &xtables_globals) == 1)
 				/* cf. ip6tables.c */
 				continue;
 			break;