From patchwork Fri Dec 13 14:21:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 63850 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 A2C82A04F1; Fri, 13 Dec 2019 15:21:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 852F11BF7A; Fri, 13 Dec 2019 15:21:47 +0100 (CET) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id DF3BF1BF31 for ; Fri, 13 Dec 2019 15:21:45 +0100 (CET) Received: by mail-pl1-f195.google.com with SMTP id p27so1296512pli.10 for ; Fri, 13 Dec 2019 06:21:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=p/vJVBXOwbF+0eqSjhxO/QL+SSt22eHWIh+dLDfbMdQ=; b=Hbx0D2XWD5CVzdMe7Kqz+ofAIv4jmIfZHSewk6N59uV0EAT1p+Nt/KbFkKAzxMncfb Ptv+ClitQVllS2C+p9mqUun8RupFstkoJIfH4sXuJhJiuH+aCSWvv+3odlHK7Dtt4DOv R1Vd6isXV+B/O6iImfSV1sZdCCNqbDzCxqNgtMl8LEkiX45E8dOI6KUPmHpXIwkBCa4z GnHWNXXrc+tlcb6cKk3S5UXMNi2vOyduc+u9R2jj3FaLcWHJxA0KyoyOA/wLSK6K1Nyc A44SOh7ewEZC+LtoN3deHLONbeWP74bl4QXg03zJMf/5tzpIZ6AbX7i3n99iIRriwwT2 PBaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p/vJVBXOwbF+0eqSjhxO/QL+SSt22eHWIh+dLDfbMdQ=; b=izIxKdhuLUQb1YjR6zCsbNHVH0tEl3B1aZlUCD78PC1UZcn3xvt/ksuAMyEW7+YNZP 6nhomppePWmS0WA4xJvRpmaTtO5cKB8ZylBVWKEy1fZMHELLmOGzSmGCDS+dFPgvKXWB zD5rRGHh7tF+M3GAnlRQ1qDi7w7vJ1X15p/TlkssHdl8J4W2Z8Vu+zV8Vc6tDmzpWeVn Ewo6yM50LNCyjpJgyQ0Tla1RnKJR0ZcY8fjch2qWpW1f9SFHic1bMCuyMwtzLqRrHnci HkB5wGzlfASEMBldqm/PRRN7b9Gf0owhT6vXs/1OYkJnk67MSevcQch/suhSpYjKufiY dyhw== X-Gm-Message-State: APjAAAUi+4nDcwQfYj5cNfkbnDHuIf+RKDcLbRtvdOtCzJt8IMxC76GP Pr19lQHaxfOPf/9BDwZ1Q+E= X-Google-Smtp-Source: APXvYqyJKdGzchRGQfik8CYAMe+WxgVCLfcqXqwMrslW4ne7dx928MUPQR+PiriXVQ+i9LlmBnIGoQ== X-Received: by 2002:a17:902:8693:: with SMTP id g19mr5951688plo.116.1576246905012; Fri, 13 Dec 2019 06:21:45 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id d77sm12607804pfd.126.2019.12.13.06.21.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Dec 2019 06:21:44 -0800 (PST) From: xiangxia.m.yue@gmail.com To: matan@mellanox.com, shahafs@mellanox.com Cc: dev@dpdk.org, Tonghao Zhang , Suanming Mou Date: Fri, 13 Dec 2019 22:21:34 +0800 Message-Id: <1576246894-31496-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH v2] net/mlx5: avoid crash when meter action conf is NULL 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" From: Tonghao Zhang When offloading the meter, should check the action conf and make sure it is valid. Fixes: f46bf7488705 ("net/mlx5: support meter flow action") Cc: Suanming Mou Signed-off-by: Tonghao Zhang Reviewed-by: Suanming Mou --- v2: coding style issues: http://patches.dpdk.org/patch/63849/ --- drivers/net/mlx5/mlx5_flow_dv.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 73aaea4..7528556 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3402,7 +3402,12 @@ struct field_modify_info modify_tcp[] = { { struct mlx5_priv *priv = dev->data->dev_private; const struct rte_flow_action_meter *am = action->conf; - struct mlx5_flow_meter *fm = mlx5_flow_meter_find(priv, am->mtr_id); + struct mlx5_flow_meter *fm; + + if (!am) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "meter action conf is NULL"); if (action_flags & MLX5_FLOW_ACTION_METER) return rte_flow_error_set(error, ENOTSUP, @@ -3417,6 +3422,8 @@ struct field_modify_info modify_tcp[] = { RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "meter action not supported"); + + fm = mlx5_flow_meter_find(priv, am->mtr_id); if (!fm) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL,