Patchwork [iptables-nftables] xtables: arp: Parse properly target's options

login
register
mail settings
Submitter Tomasz Bursztyka
Date Oct. 3, 2013, 12:26 p.m.
Message ID <1380803177-11733-1-git-send-email-tomasz.bursztyka@linux.intel.com>
Download mbox | patch
Permalink /patch/280295/
State Superseded
Headers show

Comments

Tomasz Bursztyka - Oct. 3, 2013, 12:26 p.m.
Without this, target never gets its options parsed, so it's a bug.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
 iptables/xtables-arp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Pablo Neira - Oct. 3, 2013, 1 p.m.
On Thu, Oct 03, 2013 at 03:26:17PM +0300, Tomasz Bursztyka wrote:
> Without this, target never gets its options parsed, so it's a bug.

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c
index 8072d90..147c371 100644
--- a/iptables/xtables-arp.c
+++ b/iptables/xtables-arp.c
@@ -1317,16 +1317,16 @@  int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table)
 			exit_tryhelp(2);
 
 		default:
+			if (target) {
+				xtables_option_tfcall(target);
+				xtables_option_tpcall(c, argv,
+						      invert, target, &fw);
+			}
 			break;
 		}
 		invert = FALSE;
 	}
 
-	if (target)
-		xtables_option_tfcall(target);
-
-	/* Fix me: must put inverse options checking here --MN */
-
 	if (optind < argc)
 		xtables_error(PARAMETER_PROBLEM,
 			      "unknown arguments found on commandline");