From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5D68CA9EAF for ; Mon, 21 Oct 2019 13:27:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92AA120873 for ; Mon, 21 Oct 2019 13:27:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728616AbfJUN16 (ORCPT ); Mon, 21 Oct 2019 09:27:58 -0400 Received: from Chamillionaire.breakpoint.cc ([193.142.43.52]:45058 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728017AbfJUN16 (ORCPT ); Mon, 21 Oct 2019 09:27:58 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1iMXj1-0004E9-Kj; Mon, 21 Oct 2019 15:27:55 +0200 Date: Mon, 21 Oct 2019 15:27:55 +0200 From: Florian Westphal To: Phil Sutter Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, Florian Westphal Subject: Re: [iptables PATCH v2] xtables-restore: Fix --table parameter check Message-ID: <20191021132755.GE25052@breakpoint.cc> References: <20191021132324.11039-1-phil@nwl.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191021132324.11039-1-phil@nwl.cc> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Phil Sutter wrote: > Xtables-restore tries to reject rule commands in input which contain a > --table parameter (since it is adding this itself based on the previous > table line). The manual check was not perfect though as it caught any > parameter starting with a dash and containing a 't' somewhere, even in > rule comments: > > | *filter > | -A FORWARD -m comment --comment "- allow this one" -j ACCEPT > | COMMIT > > Instead of error-prone manual checking, go a much simpler route: All > do_command callbacks are passed a boolean indicating they're called from > *tables-restore. React upon this when handling a table parameter and > error out if it's not the first one. > > if (cs.invert) > xtables_error(PARAMETER_PROBLEM, > "unexpected ! flag before --table"); > + if (restore && *table) > + xtables_error(PARAMETER_PROBLEM, > + "The -t option (seen in line %u) cannot be used in %s.\n", > + line, xt_params->program_name); Oh, thats much better indeed. Acked-by: Florian Westphal