[iptables PATCH 0/2] ip{,6}tables-restore: Fix wait-interval parsing

[iptables PATCH 0/2] ip{,6}tables-restore: Fix wait-interval parsing

[Phil Sutter]

This series fixes two problems with parsing of --wait-interval (-W) option.

Phil Sutter (2):
  ip{,6}tables-restore: Don't ignore missing wait-interval value
  ip{,6}tables-restore: Don't accept wait-interval without wait

 iptables/ip6tables-restore.c | 5 +++++
 iptables/iptables-restore.c  | 5 +++++
 iptables/xshared.c           | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

-- 
2.13.1

[iptables PATCH 1/2] ip{,6}tables-restore: Don't ignore missing wait-interval value

[Phil Sutter]

Passing -W without a value doesn't make sense so bail out if none was
given.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 iptables/xshared.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iptables/xshared.c b/iptables/xshared.c
index 825479c338214..06db72d427e21 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -343,7 +343,7 @@ void parse_wait_interval(int argc, char *argv[], struct timeval *wait_interval)
 	else if (xs_has_arg(argc, argv))
 		arg = argv[optind++];
 	else
-		return;
+		xtables_error(PARAMETER_PROBLEM, "wait interval value required");
 
 	ret = sscanf(arg, "%u", &usec);
 	if (ret == 1) {
-- 
2.13.1

[iptables PATCH 2/2] ip{,6}tables-restore: Don't accept wait-interval without wait

[Phil Sutter]

If -W <val> was given, error out if -w wasn't since that doesn't make
sense.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 iptables/ip6tables-restore.c | 5 +++++
 iptables/iptables-restore.c  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c
index eaa2bcbc3856e..47310f20b9363 100644
--- a/iptables/ip6tables-restore.c
+++ b/iptables/ip6tables-restore.c
@@ -273,6 +273,11 @@ int ip6tables_restore_main(int argc, char *argv[])
 	}
 	else in = stdin;
 
+	if (!wait_interval.tv_sec && !wait) {
+		fprintf(stderr, "Option --wait-interval requires option --wait\n");
+		exit(1);
+	}
+
 	/* Grab standard input. */
 	while (fgets(buffer, sizeof(buffer), in)) {
 		int ret = 0;
diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c
index 9dbfc572a7cec..074552af5dc74 100644
--- a/iptables/iptables-restore.c
+++ b/iptables/iptables-restore.c
@@ -271,6 +271,11 @@ iptables_restore_main(int argc, char *argv[])
 	}
 	else in = stdin;
 
+	if (!wait_interval.tv_sec && !wait) {
+		fprintf(stderr, "Option --wait-interval requires option --wait\n");
+		exit(1);
+	}
+
 	/* Grab standard input. */
 	while (fgets(buffer, sizeof(buffer), in)) {
 		int ret = 0;
-- 
2.13.1

Re: [iptables PATCH 0/2] ip{,6}tables-restore: Fix wait-interval parsing

[Pablo Neira Ayuso]

On Wed, Sep 20, 2017 at 07:34:34PM +0200, Phil Sutter wrote:
> This series fixes two problems with parsing of --wait-interval (-W) option.

Applied, thanks.