From patchwork Wed Mar 6 01:09:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 1052089 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netfilter.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44DbJs13Ffz9s4V for ; Wed, 6 Mar 2019 12:09:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728009AbfCFBJr (ORCPT ); Tue, 5 Mar 2019 20:09:47 -0500 Received: from mail.us.es ([193.147.175.20]:54662 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727701AbfCFBJr (ORCPT ); Tue, 5 Mar 2019 20:09:47 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 033FB508CE3 for ; Wed, 6 Mar 2019 02:09:45 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id E05CDDA86A for ; Wed, 6 Mar 2019 02:09:44 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id D556FDA864; Wed, 6 Mar 2019 02:09:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 0EF73DA797; Wed, 6 Mar 2019 02:09:42 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Wed, 06 Mar 2019 02:09:42 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (sys.soleta.eu [212.170.55.40]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id D466B4265A2F; Wed, 6 Mar 2019 02:09:41 +0100 (CET) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: fw@strlen.de, vaclav.zindulka@tlapnet.cz Subject: [PATCH nft 1/2] segtree: remove dummy debug_octx Date: Wed, 6 Mar 2019 02:09:37 +0100 Message-Id: <20190306010938.23687-1-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Fixes a crash with --debug=segtree. Fixes: 35f6cd327c2e ("src: Pass stateless, numeric, ip2name and handle variables as structure members.") Reported-by: Václav Zindulka Signed-off-by: Pablo Neira Ayuso --- include/expression.h | 3 ++- src/rule.c | 9 ++++++--- src/segtree.c | 6 ++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/expression.h b/include/expression.h index b681b67f96f4..6d72f64c4fea 100644 --- a/include/expression.h +++ b/include/expression.h @@ -455,7 +455,8 @@ extern struct expr *set_expr_alloc(const struct location *loc, const struct set *set); extern int set_to_intervals(struct list_head *msgs, struct set *set, struct expr *init, bool add, - unsigned int debug_mask, bool merge); + unsigned int debug_mask, bool merge, + struct output_ctx *octx); extern void interval_map_decompose(struct expr *set); extern struct expr *get_set_intervals(const struct set *set, diff --git a/src/rule.c b/src/rule.c index a3b2dbdb98a3..dc75c7cd5fb0 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1445,7 +1445,8 @@ static int do_add_setelems(struct netlink_ctx *ctx, struct cmd *cmd, if (set->flags & NFT_SET_INTERVAL && set_to_intervals(ctx->msgs, set, init, true, - ctx->nft->debug_mask, set->automerge) < 0) + ctx->nft->debug_mask, set->automerge, + &ctx->nft->output) < 0) return -1; return __do_add_setelems(ctx, set, init, flags); @@ -1459,7 +1460,8 @@ static int do_add_set(struct netlink_ctx *ctx, const struct cmd *cmd, if (set->init != NULL) { if (set->flags & NFT_SET_INTERVAL && set_to_intervals(ctx->msgs, set, set->init, true, - ctx->nft->debug_mask, set->automerge) < 0) + ctx->nft->debug_mask, set->automerge, + &ctx->nft->output) < 0) return -1; } if (mnl_nft_set_add(ctx, cmd, flags) < 0) @@ -1556,7 +1558,8 @@ static int do_delete_setelems(struct netlink_ctx *ctx, struct cmd *cmd) if (set->flags & NFT_SET_INTERVAL && set_to_intervals(ctx->msgs, set, expr, false, - ctx->nft->debug_mask, set->automerge) < 0) + ctx->nft->debug_mask, set->automerge, + &ctx->nft->output) < 0) return -1; if (mnl_nft_setelem_del(ctx, cmd) < 0) diff --git a/src/segtree.c b/src/segtree.c index e5dfd413ef83..ecf564e5fa07 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -67,8 +67,6 @@ struct elementary_interval { struct expr *expr; }; -static struct output_ctx debug_octx = {}; - static void seg_tree_init(struct seg_tree *tree, const struct set *set, struct expr *init, unsigned int debug_mask) { @@ -567,7 +565,7 @@ static void set_insert_interval(struct expr *set, struct seg_tree *tree, int set_to_intervals(struct list_head *errs, struct set *set, struct expr *init, bool add, unsigned int debug_mask, - bool merge) + bool merge, struct output_ctx *octx) { struct elementary_interval *ei, *next; struct seg_tree tree; @@ -590,7 +588,7 @@ int set_to_intervals(struct list_head *errs, struct set *set, } if (segtree_debug(tree.debug_mask)) { - expr_print(init, &debug_octx); + expr_print(init, octx); pr_gmp_debug("\n"); } From patchwork Wed Mar 6 01:09:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 1052090 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netfilter.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44DbJt5F6yz9s7h for ; Wed, 6 Mar 2019 12:09:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728029AbfCFBJr (ORCPT ); Tue, 5 Mar 2019 20:09:47 -0500 Received: from mail.us.es ([193.147.175.20]:54668 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727773AbfCFBJr (ORCPT ); Tue, 5 Mar 2019 20:09:47 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 1CB55508CE8 for ; Wed, 6 Mar 2019 02:09:45 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 073D5DA84C for ; Wed, 6 Mar 2019 02:09:45 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 05DC9DA797; Wed, 6 Mar 2019 02:09:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 0BE44DA84E; Wed, 6 Mar 2019 02:09:43 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Wed, 06 Mar 2019 02:09:43 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (sys.soleta.eu [212.170.55.40]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id D44B54265A2F; Wed, 6 Mar 2019 02:09:42 +0100 (CET) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: fw@strlen.de, vaclav.zindulka@tlapnet.cz Subject: [PATCH nft 2/2] segtree: add missing non-matching segment to set in flat representation Date: Wed, 6 Mar 2019 02:09:38 +0100 Message-Id: <20190306010938.23687-2-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190306010938.23687-1-pablo@netfilter.org> References: <20190306010938.23687-1-pablo@netfilter.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org # cat test.nft add set x y { type ipv4_addr; } add element x y { 10.0.24.0/24 } # nft -f test.nft # nft delete element x y { 10.0.24.0/24 } bogusly return -ENOENT. The closing segment (0.0.0.0 with end flag set on ) is not added to the set in the example above. This patch also adds a test to catch this case. Fixes: 4935a0d561b5 ("segtree: special handling for the first non-matching segment") Reported-by: Václav Zindulka Signed-off-by: Pablo Neira Ayuso --- src/segtree.c | 9 ++++++--- tests/shell/testcases/sets/0035add_set_elements_flat_0 | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100755 tests/shell/testcases/sets/0035add_set_elements_flat_0 diff --git a/src/segtree.c b/src/segtree.c index ecf564e5fa07..8034525fb80b 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -430,16 +430,19 @@ static bool segtree_needs_first_segment(const struct set *set, const struct expr *init, bool add) { if (add) { - /* Add the first segment in three situations: + /* Add the first segment in four situations: * * 1) This is an anonymous set. * 2) This set exists and it is empty. - * 3) This set is created with a number of initial elements. + * 3) New empty set and, separately, new elements are added. + * 4) This set is created with a number of initial elements. */ if ((set->flags & NFT_SET_ANONYMOUS) || (set->init && set->init->size == 0) || - (set->init == init)) + (set->init == NULL && init) || + (set->init == init)) { return true; + } } else { /* If the set is empty after the removal, we have to * remove the first non-matching segment too. diff --git a/tests/shell/testcases/sets/0035add_set_elements_flat_0 b/tests/shell/testcases/sets/0035add_set_elements_flat_0 new file mode 100755 index 000000000000..d914ba9846ca --- /dev/null +++ b/tests/shell/testcases/sets/0035add_set_elements_flat_0 @@ -0,0 +1,10 @@ +#!/bin/bash + +RULESET="add table ip x +add set x y {type ipv4_addr; flags interval;} +add element x y { 10.0.24.0/24 } +" + +set -e +$NFT -f - <<< "$RULESET" +$NFT delete element x y { 10.0.24.0/24 }