From patchwork Thu Oct 22 08:26:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Britstein X-Patchwork-Id: 81747 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 04258A04DD; Thu, 22 Oct 2020 10:26:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E44CAA92B; Thu, 22 Oct 2020 10:26:53 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 225ABA902 for ; Thu, 22 Oct 2020 10:26:52 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from elibr@nvidia.com) with SMTP; 22 Oct 2020 11:26:49 +0300 Received: from nvidia.com (dev-r-vrt-214.mtr.labs.mlnx [10.212.214.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09M8Qn6m028014; Thu, 22 Oct 2020 11:26:49 +0300 From: Eli Britstein To: dev@dpdk.org Cc: Dekel Peled , Ori Kam , Matan Azrad , Raslan Darawsheh , Slava Ovsiienko , Shahaf Shuler , Asaf Penso , Eli Britstein Date: Thu, 22 Oct 2020 08:26:29 +0000 Message-Id: <20201022082629.9160-1-elibr@nvidia.com> X-Mailer: git-send-email 2.28.0.546.g385c171 In-Reply-To: References: MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH V3 1/1] net/mlx5: fix IPv6 next proto validation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Previous patch added validation of the IPv6 next proto field, in order to overcome a known limitation. One of the values checked is IPPROTO_HOPOPTS, which is defined as 0. If proto field is not specified for matching, or mask=0, as in the following, a wrong validation takes place. flow create 0 ingress pattern eth / ipv6 has_frag_ext is 0 / end actions drop / end Fix the validation only on proto asked by the user. Fixes: 92be60e1b541 ("net/mlx5: enforce limitation on IPv6 next proto") Signed-off-by: Eli Britstein Acked-by: Dekel Peled Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 22fb4ee60a..d7243a878b 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1979,8 +1979,8 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item, RTE_FLOW_ERROR_TYPE_ITEM, item, "IPv6 cannot follow L2/VLAN layer " "which ether type is not IPv6"); - if (mask && spec) - next_proto = mask->hdr.proto & spec->hdr.proto; + if (mask && mask->hdr.proto == UINT8_MAX && spec) + next_proto = spec->hdr.proto; if (item_flags & MLX5_FLOW_LAYER_IPV6_ENCAP) { if (next_proto == IPPROTO_IPIP || next_proto == IPPROTO_IPV6) return rte_flow_error_set(error, EINVAL,