From patchwork Sat Feb 2 10:09:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1035404 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=strlen.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43s94P4FJXz9sBZ for ; Sat, 2 Feb 2019 21:21:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727352AbfBBKVi (ORCPT ); Sat, 2 Feb 2019 05:21:38 -0500 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:50148 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726540AbfBBKVi (ORCPT ); Sat, 2 Feb 2019 05:21:38 -0500 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.89) (envelope-from ) id 1gpsQa-0000RU-IX; Sat, 02 Feb 2019 11:21:36 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nf-next] netfilter: nf_tables: don't break when vmap lookup yields no result Date: Sat, 2 Feb 2019 11:09:55 +0100 Message-Id: <20190202100955.822-1-fw@strlen.de> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org instead just let the eval loop continue with remaining expressions, if any. This allows to catch non-matching packets in the same rule, e.g.: ip protocol vmap { tcp : jump tcp_tests, udp : jump udp_tests } counter jump other Signed-off-by: Florian Westphal --- net/netfilter/nft_lookup.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c index 227b2b15a19c..2d7c560343da 100644 --- a/net/netfilter/nft_lookup.c +++ b/net/netfilter/nft_lookup.c @@ -37,15 +37,19 @@ void nft_lookup_eval(const struct nft_expr *expr, found = set->ops->lookup(nft_net(pkt), set, ®s->data[priv->sreg], &ext) ^ priv->invert; - if (!found) { - regs->verdict.code = NFT_BREAK; - return; - } - if (set->flags & NFT_SET_MAP) - nft_data_copy(®s->data[priv->dreg], - nft_set_ext_data(ext), set->dlen); + if (set->flags & NFT_SET_MAP) { + if (!found) { + if (priv->dreg != NFT_REG_VERDICT) + regs->verdict.code = NFT_BREAK; + return; + } + nft_data_copy(®s->data[priv->dreg], + nft_set_ext_data(ext), set->dlen); + } else if (!found) { + regs->verdict.code = NFT_BREAK; + } } static const struct nla_policy nft_lookup_policy[NFTA_LOOKUP_MAX + 1] = {