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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8806CC433EF for ; Thu, 3 Mar 2022 14:44:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232300AbiCCOpU (ORCPT ); Thu, 3 Mar 2022 09:45:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229893AbiCCOpT (ORCPT ); Thu, 3 Mar 2022 09:45:19 -0500 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 649E018A793 for ; Thu, 3 Mar 2022 06:44:34 -0800 (PST) Received: from localhost.localdomain (unknown [78.30.32.163]) by mail.netfilter.org (Postfix) with ESMTPSA id B4A2B62BD3 for ; Thu, 3 Mar 2022 15:42:59 +0100 (CET) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft,v2] optimize: do not merge unsupported statement expressions Date: Thu, 3 Mar 2022 15:44:25 +0100 Message-Id: <20220303144425.731642-1-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Only value, range, prefix, set and list are supported at this stage. Signed-off-by: Pablo Neira Ayuso --- v2: check for EXPR_SYMBOL instead of EXPR_VALUE, evaluation phase did not happen yet. src/optimize.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/optimize.c b/src/optimize.c index c81d19d4739b..d0ae96ca43c5 100644 --- a/src/optimize.c +++ b/src/optimize.c @@ -91,6 +91,22 @@ static bool __expr_cmp(const struct expr *expr_a, const struct expr *expr_b) return true; } +static bool stmt_expr_supported(const struct expr *expr) +{ + switch (expr->right->etype) { + case EXPR_SYMBOL: + case EXPR_RANGE: + case EXPR_PREFIX: + case EXPR_SET: + case EXPR_LIST: + return true; + default: + break; + } + + return false; +} + static bool __stmt_type_eq(const struct stmt *stmt_a, const struct stmt *stmt_b) { struct expr *expr_a, *expr_b; @@ -103,6 +119,10 @@ static bool __stmt_type_eq(const struct stmt *stmt_a, const struct stmt *stmt_b) expr_a = stmt_a->expr; expr_b = stmt_b->expr; + if (!stmt_expr_supported(expr_a) || + !stmt_expr_supported(expr_b)) + return false; + return __expr_cmp(expr_a->left, expr_b->left); case STMT_COUNTER: case STMT_NOTRACK: -- 2.30.2