From patchwork Thu Oct 3 12:26:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Bursztyka X-Patchwork-Id: 280295 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3DCD22C00C3 for ; Thu, 3 Oct 2013 22:26:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753659Ab3JCM0g (ORCPT ); Thu, 3 Oct 2013 08:26:36 -0400 Received: from mga02.intel.com ([134.134.136.20]:23882 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753615Ab3JCM0g (ORCPT ); Thu, 3 Oct 2013 08:26:36 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 03 Oct 2013 05:26:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,1026,1371106800"; d="scan'208";a="387290985" Received: from rd-180.fi.intel.com ([10.237.68.49]) by orsmga001.jf.intel.com with ESMTP; 03 Oct 2013 05:26:20 -0700 From: Tomasz Bursztyka To: netfilter-devel@vger.kernel.org Cc: Tomasz Bursztyka Subject: [iptables-nftables PATCH] xtables: arp: Parse properly target's options Date: Thu, 3 Oct 2013 15:26:17 +0300 Message-Id: <1380803177-11733-1-git-send-email-tomasz.bursztyka@linux.intel.com> X-Mailer: git-send-email 1.8.3.2 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Without this, target never gets its options parsed, so it's a bug. Signed-off-by: Tomasz Bursztyka --- iptables/xtables-arp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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");