From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 64C07A00C2 for ; Tue, 8 Mar 2022 15:15:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F55C4068B; Tue, 8 Mar 2022 15:15:58 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1D7B24068B for ; Tue, 8 Mar 2022 15:15:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t0BEJBEwUA/KYLuNN/FJhNPWJUuvcP0wxGP0SshCwJU=; b=PHioQqCZ3d1lezvbeqfyeOh2yPyhdSTMBKKGDqKhpZwWX+MytuvaJMibiskm1fSiiT42dr 1FmnHx9enm8CMy56sw8dkWd/k2JQhCW/giCpSADN8fSBmNvIlqhZMwPmNvTy0Tsi8rzram 45GFlaEwv2DJ+C7diSuXs8uL0VkPJ38= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-189-EzfhkPI9NkeZC6ZGJmQrig-1; Tue, 08 Mar 2022 09:15:52 -0500 X-MC-Unique: EzfhkPI9NkeZC6ZGJmQrig-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F5A31800D50; Tue, 8 Mar 2022 14:15:51 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id B478784034; Tue, 8 Mar 2022 14:15:49 +0000 (UTC) From: Kevin Traynor To: Adham Masarwah Cc: Viacheslav Ovsiienko , Tal Shnaiderman , Idan Hackmon , dpdk stable Subject: patch 'net/mlx5: fix destroying empty matchers list' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:33 +0000 Message-Id: <20220308141500.286915-18-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/14/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/10af65574b7f862f49744b6cb8a6b8e5aa77e1cb Thanks. Kevin --- >From 10af65574b7f862f49744b6cb8a6b8e5aa77e1cb Mon Sep 17 00:00:00 2001 From: Adham Masarwah Date: Wed, 23 Feb 2022 11:32:05 +0200 Subject: [PATCH] net/mlx5: fix destroying empty matchers list [ upstream commit dc065d6efdf1cabe042944aac457fa19235ad632 ] The table remove callback function is trying to destroy the matchers list associated with table entries without checking if the list is valid, which causes null pointer dereference. Fixed by validating the matchers list before destroying it. Issue can be reproduced with testpmd on Windows, when you run: port close all Fixes: 1872635570be ("net/mlx5: make matcher list thread safe") Signed-off-by: Adham Masarwah Acked-by: Viacheslav Ovsiienko Acked-by: Tal Shnaiderman Tested-by: Idan Hackmon --- drivers/net/mlx5/mlx5_flow_dv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 5225978a3b..43d8db14ad 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -10519,5 +10519,6 @@ flow_dv_tbl_remove_cb(void *tool_ctx, struct mlx5_list_entry *entry) tbl_data->group_id); } - mlx5_list_destroy(tbl_data->matchers); + if (tbl_data->matchers) + mlx5_list_destroy(tbl_data->matchers); mlx5_ipool_free(sh->ipool[MLX5_IPOOL_JUMP], tbl_data->idx); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:28.875916537 +0000 +++ 0018-net-mlx5-fix-destroying-empty-matchers-list.patch 2022-03-08 13:55:28.429314978 +0000 @@ -1 +1 @@ -From dc065d6efdf1cabe042944aac457fa19235ad632 Mon Sep 17 00:00:00 2001 +From 10af65574b7f862f49744b6cb8a6b8e5aa77e1cb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dc065d6efdf1cabe042944aac457fa19235ad632 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index ae88a1cc29..caee0f7c91 100644 +index 5225978a3b..43d8db14ad 100644 @@ -29 +30 @@ -@@ -10621,5 +10621,6 @@ flow_dv_tbl_remove_cb(void *tool_ctx, struct mlx5_list_entry *entry) +@@ -10519,5 +10519,6 @@ flow_dv_tbl_remove_cb(void *tool_ctx, struct mlx5_list_entry *entry)