matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: m_xt: Fix segfault when adding multiple actions at once 

Without this, the following call to tc would segfault:

| tc filter add dev d0 parent ffff: u32 match u32 0 0 \
| 	action xt -j MARK --set-mark 0x1 \
| 	action xt -j MARK --set-mark 0x1

The reason is basically the same as for 6e2e5ec28b ("fix print_ipt:
segfault if more then one filter with action -j MARK.") but in
parse_ipt() instead of print_ipt().

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2016-06-10 13:42:01 +02:00 committed by Stephen Hemminger
parent 445745221a
commit 8eee75a835
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tc/m_xt.c
View File

@ -133,7 +133,9 @@ static int parse_ipt(struct action_util *a, int *argc_p,
__u32 hook = 0, index = 0; __u32 hook = 0, index = 0;
struct option *opts = NULL; struct option *opts = NULL;
xtables_init_all(&tcipt_globals, NFPROTO_IPV4); /* copy tcipt_globals because .opts will be modified by iptables */
struct xtables_globals tmp_tcipt_globals = tcipt_globals;
xtables_init_all(&tmp_tcipt_globals, NFPROTO_IPV4);
set_lib_dir(); set_lib_dir();
{ {
@ -153,7 +155,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
} }
while (1) { while (1) {
c = getopt_long(argc, argv, "j:", tcipt_globals.opts, NULL); c = getopt_long(argc, argv, "j:", tmp_tcipt_globals.opts, NULL);
if (c == -1) if (c == -1)
break; break;
switch (c) { switch (c) {
@ -166,12 +168,12 @@ static int parse_ipt(struct action_util *a, int *argc_p,
return -1; return -1;
} }
#if (XTABLES_VERSION_CODE >= 6) #if (XTABLES_VERSION_CODE >= 6)
opts = xtables_options_xfrm(tcipt_globals.orig_opts, opts = xtables_options_xfrm(tmp_tcipt_globals.orig_opts,
tcipt_globals.opts, tmp_tcipt_globals.opts,
m->x6_options, m->x6_options,
&m->option_offset); &m->option_offset);
#else #else
opts = xtables_merge_options(tcipt_globals.opts, opts = xtables_merge_options(tmp_tcipt_globals.opts,
m->extra_opts, m->extra_opts,
&m->option_offset); &m->option_offset);
#endif #endif
@ -179,7 +181,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
fprintf(stderr, " failed to find additional options for target %s\n\n", optarg); fprintf(stderr, " failed to find additional options for target %s\n\n", optarg);
return -1; return -1;
} else } else
tcipt_globals.opts = opts; tmp_tcipt_globals.opts = opts;
} else { } else {
fprintf(stderr, " failed to find target %s\n\n", optarg); fprintf(stderr, " failed to find target %s\n\n", optarg);
return -1; return -1;