From patchwork Mon Jan 19 13:27:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Borrero X-Patchwork-Id: 430448 X-Patchwork-Delegate: pablo@netfilter.org 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 B54C01401EB for ; Tue, 20 Jan 2015 00:27:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642AbbASN1z (ORCPT ); Mon, 19 Jan 2015 08:27:55 -0500 Received: from smtp3.cica.es ([150.214.5.190]:57006 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751582AbbASN1z (ORCPT ); Mon, 19 Jan 2015 08:27:55 -0500 Received: from localhost (unknown [127.0.0.1]) by smtp.cica.es (Postfix) with ESMTP id BBECE51F1EE; Mon, 19 Jan 2015 13:27:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at cica.es Received: from smtp.cica.es ([127.0.0.1]) by localhost (mail.cica.es [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q5tXQxK7pOcc; Mon, 19 Jan 2015 14:27:48 +0100 (CET) Received: from nfdev.cica.es (nfdev.cica.es [150.214.8.220]) by smtp.cica.es (Postfix) with ESMTP id C266151F0E7; Mon, 19 Jan 2015 14:27:48 +0100 (CET) Subject: [ebtables-compat PATCH 3/7] ebtables-compat: prevent options overwrite From: Arturo Borrero Gonzalez To: netfilter-devel@vger.kernel.org Cc: giuseppelng@gmail.com, pablo@netfilter.org Date: Mon, 19 Jan 2015 14:27:46 +0100 Message-ID: <20150119132746.7422.84800.stgit@nfdev.cica.es> In-Reply-To: <20150119132735.7422.85388.stgit@nfdev.cica.es> References: <20150119132735.7422.85388.stgit@nfdev.cica.es> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Parsing options will be overwritten if every time we load a match the extension options are merged to the original options. Signed-off-by: Arturo Borrero Gonzalez --- iptables/xtables-eb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index d0f6a3e..b559a53 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -618,7 +618,6 @@ static void ebt_load_match(const char *name) { struct xtables_match *m; size_t size; - opts = ebt_original_options; m = xtables_find_match(name, XTF_LOAD_MUST_SUCCEED, NULL); if (m == NULL) @@ -638,6 +637,7 @@ static void ebt_load_match(const char *name) static void ebt_load_matches(void) { + opts = ebt_original_options; ebt_load_match("802_3"); }