diff options
author | Phil Sutter <phil@nwl.cc> | 2019-09-20 17:31:58 +0200 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2019-10-21 16:15:34 +0200 |
commit | 3dc433b55bbfaf9df3ee408aaa6282742f377864 (patch) | |
tree | 0e867ad01427cfc52b747064e54b7d10364666f1 | |
parent | 55a7558bb2c86e650809610e976e9d5192fe4e7e (diff) | |
download | platform_external_iptables-3dc433b55bbfaf9df3ee408aaa6282742f377864.tar.gz platform_external_iptables-3dc433b55bbfaf9df3ee408aaa6282742f377864.tar.bz2 platform_external_iptables-3dc433b55bbfaf9df3ee408aaa6282742f377864.zip |
xtables-restore: Fix --table parameter check
Xtables-restore tries to reject rule commands in input which contain a
--table parameter (since it is adding this itself based on the previous
table line). The manual check was not perfect though as it caught any
parameter starting with a dash and containing a 't' somewhere, even in
rule comments:
| *filter
| -A FORWARD -m comment --comment "- allow this one" -j ACCEPT
| COMMIT
Instead of error-prone manual checking, go a much simpler route: All
do_command callbacks are passed a boolean indicating they're called from
*tables-restore. React upon this when handling a table parameter and
error out if it's not the first one.
Fixes: f8e5ebc5986bf ("iptables: Fix crash on malformed iptables-restore")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Florian Westphal <fw@strlen.de>
-rw-r--r-- | iptables/iptables.c | 4 | ||||
-rwxr-xr-x | iptables/tests/shell/testcases/ipt-restore/0009-table-name-comment_0 | 13 | ||||
-rw-r--r-- | iptables/xshared.c | 12 | ||||
-rw-r--r-- | iptables/xtables-eb.c | 4 | ||||
-rw-r--r-- | iptables/xtables.c | 4 |
5 files changed, 25 insertions, 12 deletions
diff --git a/iptables/iptables.c b/iptables/iptables.c index 0fbe3ec9..d7a41321 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -1494,6 +1494,10 @@ int do_command4(int argc, char *argv[], char **table, if (cs.invert) xtables_error(PARAMETER_PROBLEM, "unexpected ! flag before --table"); + if (restore && *table) + xtables_error(PARAMETER_PROBLEM, + "The -t option (seen in line %u) cannot be used in %s.\n", + line, xt_params->program_name); *table = optarg; break; diff --git a/iptables/tests/shell/testcases/ipt-restore/0009-table-name-comment_0 b/iptables/tests/shell/testcases/ipt-restore/0009-table-name-comment_0 new file mode 100755 index 00000000..4e2202df --- /dev/null +++ b/iptables/tests/shell/testcases/ipt-restore/0009-table-name-comment_0 @@ -0,0 +1,13 @@ +#!/bin/bash + +# when restoring a ruleset, *tables-restore prefixes each rule with +# '-t <tablename>' so standard rule parsing routines may be used. This means +# that it has to detect and reject rules which already contain a table option. + +$XT_MULTI iptables-restore <<EOF +*filter +-t nat -A FORWARD -j ACCEPT +COMMIT +EOF + +[[ $? != 0 ]] || exit 1 diff --git a/iptables/xshared.c b/iptables/xshared.c index ba723f59..5211b647 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -533,18 +533,6 @@ void add_param_to_argv(char *parsestart, int line) } param.buffer[param.len] = '\0'; - - /* check if table name specified */ - if ((param.buffer[0] == '-' && - param.buffer[1] != '-' && - strchr(param.buffer, 't')) || - (!strncmp(param.buffer, "--t", 3) && - !strncmp(param.buffer, "--table", strlen(param.buffer)))) { - xtables_error(PARAMETER_PROBLEM, - "The -t option (seen in line %u) cannot be used in %s.\n", - line, xt_params->program_name); - } - add_argv(param.buffer, 0); param.len = 0; } diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index 3b03daef..aa754d79 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -947,6 +947,10 @@ print_zero: break; case 't': /* Table */ ebt_check_option2(&flags, OPT_TABLE); + if (restore && *table) + xtables_error(PARAMETER_PROBLEM, + "The -t option (seen in line %u) cannot be used in %s.\n", + line, xt_params->program_name); if (strlen(optarg) > EBT_TABLE_MAXNAMELEN - 1) xtables_error(PARAMETER_PROBLEM, "Table name length cannot exceed %d characters", diff --git a/iptables/xtables.c b/iptables/xtables.c index 0e0cb5f5..89f3271e 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -879,6 +879,10 @@ void do_parse(struct nft_handle *h, int argc, char *argv[], if (cs->invert) xtables_error(PARAMETER_PROBLEM, "unexpected ! flag before --table"); + if (p->restore && p->table) + xtables_error(PARAMETER_PROBLEM, + "The -t option (seen in line %u) cannot be used in %s.\n", + line, xt_params->program_name); if (!nft_table_builtin_find(h, optarg)) xtables_error(VERSION_PROBLEM, "table '%s' does not exist", |