diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-12-04 09:56:06 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-12-04 23:44:28 +0100 |
| commit | a103fbfadf4c17b8b12caa57eef72deaaa71a18c (patch) | |
| tree | 57b58f50943667acd1194a14cba45f06069058aa /iptables/xtables-restore.c | |
| parent | 066a19596ae3d69b49a70405e2daf75c929dcd4d (diff) | |
xtables-restore: Fix parser feed from line buffer
When called with --noflush, xtables-restore would trip over chain lines:
Parser uses strtok() to separate chain name, policy and counters which
inserts nul-chars into the source string. Therefore strlen() can't be
used anymore to find end of line. Fix this by caching line length before
calling xtables_restore_parse_line().
Fixes: 09cb517949e69 ("xtables-restore: Improve performance of --noflush operation")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/xtables-restore.c')
| -rw-r--r-- | iptables/xtables-restore.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index 2f0fe7d4..dd907e0b 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -327,10 +327,12 @@ void xtables_restore_parse(struct nft_handle *h, line = 0; ptr = preload_buffer; while (*ptr) { + size_t len = strlen(ptr); + h->error.lineno = ++line; DEBUGP("%s: buffered line %d: '%s'\n", __func__, line, ptr); xtables_restore_parse_line(h, p, &state, ptr); - ptr += strlen(ptr) + 1; + ptr += len + 1; } if (*buffer) { h->error.lineno = ++line; |