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 83A1CA0555 for ; Thu, 9 Jun 2022 13:37:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78E0F40220; Thu, 9 Jun 2022 13:37:54 +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 B4F2C40220 for ; Thu, 9 Jun 2022 13:37:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774672; 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=9dR+Q924k9ywZiFl5WHrqVWt71UHC+OJ30v+OuSf1kQ=; b=TcydhZVrqrSAYBL7FA+qchshrdOPAXeC1TGvIaXe4Hg/dISZa7JYBBoyeIYsfIDpJ9YhxW vq8BAtlDrT3pXLa0w514CDcJqj71jzfTdNG63T6EwpYpnXjQ57d6mqbn45aPDn+YeRLPpP NY5ElMPuSDQtcIoFYNIIj8lSHD5DSG0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-EuBn_BDQNRKcdNb__zH4AQ-1; Thu, 09 Jun 2022 07:37:47 -0400 X-MC-Unique: EuBn_BDQNRKcdNb__zH4AQ-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 B419A801E67; Thu, 9 Jun 2022 11:37:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id C553C18EA3; Thu, 9 Jun 2022 11:37:45 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Andrew Rybchenko , dpdk stable Subject: patch 'ethdev: fix possible null pointer access' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:13 +0100 Message-Id: <20220609113701.386938-26-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/c81b66e128a778261168988e06d667e1615bc6e7 Thanks. Kevin --- >From c81b66e128a778261168988e06d667e1615bc6e7 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 13 May 2022 10:53:56 +0800 Subject: [PATCH] ethdev: fix possible null pointer access MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 590e988fdfca241d810d6cc94098c223ccb7c737 ] The rte_tel_data_alloc() may return NULL, so the caller should add judgement for it. Fixes: 083b0b310b19 ("ethdev: add common stats for telemetry") Signed-off-by: Chengwen Feng Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- lib/ethdev/rte_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 5846e35804..1704e852b5 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6183,4 +6183,6 @@ eth_dev_add_port_queue_stats(struct rte_tel_data *d, uint64_t *q_stats, int q; struct rte_tel_data *q_data = rte_tel_data_alloc(); + if (q_data == NULL) + return; rte_tel_data_start_array(q_data, RTE_TEL_U64_VAL); for (q = 0; q < RTE_ETHDEV_QUEUE_STAT_CNTRS; q++) -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.383100684 +0100 +++ 0026-ethdev-fix-possible-null-pointer-access.patch 2022-06-09 12:34:29.685980538 +0100 @@ -1 +1 @@ -From 590e988fdfca241d810d6cc94098c223ccb7c737 Mon Sep 17 00:00:00 2001 +From c81b66e128a778261168988e06d667e1615bc6e7 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 590e988fdfca241d810d6cc94098c223ccb7c737 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index dc47543e6b..a175867651 100644 +index 5846e35804..1704e852b5 100644 @@ -26 +27 @@ -@@ -5503,4 +5503,6 @@ eth_dev_add_port_queue_stats(struct rte_tel_data *d, uint64_t *q_stats, +@@ -6183,4 +6183,6 @@ eth_dev_add_port_queue_stats(struct rte_tel_data *d, uint64_t *q_stats,