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 A32ADA0555 for ; Thu, 9 Jun 2022 13:37:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E36441614; Thu, 9 Jun 2022 13:37:55 +0200 (CEST) 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 06B5440220 for ; Thu, 9 Jun 2022 13:37:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774673; 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=Btdg/dXw3Q7gwuDBODS9rNomgauk1GGHnx99wgCKBEo=; b=Q91F/lnwFZvYV53sQfJRkBl4HkBYjbwCFsbNPWMGAgmycfdONWqeAo43MqA1NgA1ztMZOP iXMNa7YoozZW9f1SNtUUsYeIrfISRYhu91+ph3I6NuHyRJI2MLTLKnasqp/5lcNz+5PLpm dKMYdUQv5zHeV7C34/56NG8UtJ4u5qc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-5-d_i1ug0EOTSSZ0y_BZNjGw-1; Thu, 09 Jun 2022 07:37:48 -0400 X-MC-Unique: d_i1ug0EOTSSZ0y_BZNjGw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 227C73C021A0; Thu, 9 Jun 2022 11:37:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0044F18EA3; Thu, 9 Jun 2022 11:37:46 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Andrew Rybchenko , dpdk stable Subject: patch 'net/cnxk: fix possible null dereference in telemetry' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:14 +0100 Message-Id: <20220609113701.386938-27-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/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/c5693310a68473007a05801a279684e636ff1cb8 Thanks. Kevin --- >From c5693310a68473007a05801a279684e636ff1cb8 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 13 May 2022 10:53:57 +0800 Subject: [PATCH] net/cnxk: fix possible null dereference in telemetry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 67ead3fa8c3a6775b2b0c9888afd08bdf02c4d9b ] The return value of rte_tel_data_alloc() may be null pointer. Add missing check vs null. Fixes: 5ea354a1f2cc ("net/cnxk: support telemetry") Signed-off-by: Chengwen Feng Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- drivers/net/cnxk/cnxk_ethdev_telemetry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/cnxk/cnxk_ethdev_telemetry.c b/drivers/net/cnxk/cnxk_ethdev_telemetry.c index 83bc65848c..4fd9048643 100644 --- a/drivers/net/cnxk/cnxk_ethdev_telemetry.c +++ b/drivers/net/cnxk/cnxk_ethdev_telemetry.c @@ -50,4 +50,6 @@ ethdev_tel_handle_info(const char *cmd __rte_unused, i_data = rte_tel_data_alloc(); + if (i_data == NULL) + return -ENOMEM; rte_tel_data_start_array(i_data, RTE_TEL_U64_VAL); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.404880365 +0100 +++ 0027-net-cnxk-fix-possible-null-dereference-in-telemetry.patch 2022-06-09 12:34:29.685980538 +0100 @@ -1 +1 @@ -From 67ead3fa8c3a6775b2b0c9888afd08bdf02c4d9b Mon Sep 17 00:00:00 2001 +From c5693310a68473007a05801a279684e636ff1cb8 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 67ead3fa8c3a6775b2b0c9888afd08bdf02c4d9b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index b76dbdfef9..180108ab9c 100644 +index 83bc65848c..4fd9048643 100644 @@ -26 +27 @@ -@@ -51,4 +51,6 @@ ethdev_tel_handle_info(const char *cmd __rte_unused, +@@ -50,4 +50,6 @@ ethdev_tel_handle_info(const char *cmd __rte_unused,