patch 'power/intel_uncore: fix crash closing uninitialized driver' has been queued to stable release 23.11.5

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.5

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/28/25. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=16af361233f7d8a9bcf818a8e7062a94cc656381

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 16af361233f7d8a9bcf818a8e7062a94cc656381 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 15 May 2025 17:58:53 +0100
Subject: [PATCH] power/intel_uncore: fix crash closing uninitialized driver
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 74c4b081825123350578f18dc838ec0bf69ba03b ]

When the power_intel_uncore_autotest unit test is run as an unprivileged
user which cannot init the power library, it crashes the unit test
binary due to calling "rte_power_uncore_exit" after the first test case
(initialization) fails. This crash is due to trying to write to NULL
file handles.

Fix the crash by checking each file handle is non-null before writing to
it and closing it.

Fixes: 60b8a661a957 ("power: add Intel uncore frequency control")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Kevin Laatz <kevin.laatz at intel.com>
---
 lib/power/power_intel_uncore.c | 35 +++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/power/power_intel_uncore.c b/lib/power/power_intel_uncore.c
index be174dce44..2a6977e332 100644
--- a/lib/power/power_intel_uncore.c
+++ b/lib/power/power_intel_uncore.c
@@ -307,27 +307,28 @@ power_intel_uncore_exit(unsigned int pkg, unsigned int die)
 
 	ui = &uncore_info[pkg][die];
 
-	if (fprintf(ui->f_cur_min, "%u", ui->org_min_freq) < 0) {
-		RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
-				"pkg %02u die %02u\n", ui->pkg, ui->die);
-		return -1;
+	if (ui->f_cur_min != NULL) {
+		if (fprintf(ui->f_cur_min, "%u", ui->org_min_freq) < 0) {
+			RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
+					"pkg %02u die %02u\n", ui->pkg, ui->die);
+			return -1;
+		}
+		fflush(ui->f_cur_min);
+		fclose(ui->f_cur_min);
+		ui->f_cur_min = NULL;
 	}
 
-	if (fprintf(ui->f_cur_max, "%u", ui->org_max_freq) < 0) {
-		RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
-				"pkg %02u die %02u\n", ui->pkg, ui->die);
-		return -1;
+	if (ui->f_cur_max != NULL) {
+		if (fprintf(ui->f_cur_max, "%u", ui->org_max_freq) < 0) {
+			RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
+					"pkg %02u die %02u\n", ui->pkg, ui->die);
+			return -1;
+		}
+		fflush(ui->f_cur_max);
+		fclose(ui->f_cur_max);
+		ui->f_cur_max = NULL;
 	}
 
-	fflush(ui->f_cur_min);
-	fflush(ui->f_cur_max);
-
-	/* Close FD of setting freq */
-	fclose(ui->f_cur_min);
-	fclose(ui->f_cur_max);
-	ui->f_cur_min = NULL;
-	ui->f_cur_max = NULL;
-
 	return 0;
 }
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-26 19:59:20.659116207 +0800
+++ 0078-power-intel_uncore-fix-crash-closing-uninitialized-d.patch	2025-06-26 19:59:17.506418039 +0800
@@ -1 +1 @@
-From 74c4b081825123350578f18dc838ec0bf69ba03b Mon Sep 17 00:00:00 2001
+From 16af361233f7d8a9bcf818a8e7062a94cc656381 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 74c4b081825123350578f18dc838ec0bf69ba03b ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
- drivers/power/intel_uncore/intel_uncore.c | 35 ++++++++++++-----------
+ lib/power/power_intel_uncore.c | 35 +++++++++++++++++-----------------
@@ -24,4 +26,4 @@
-diff --git a/drivers/power/intel_uncore/intel_uncore.c b/drivers/power/intel_uncore/intel_uncore.c
-index 804ad5d755..6759ea1445 100644
---- a/drivers/power/intel_uncore/intel_uncore.c
-+++ b/drivers/power/intel_uncore/intel_uncore.c
+diff --git a/lib/power/power_intel_uncore.c b/lib/power/power_intel_uncore.c
+index be174dce44..2a6977e332 100644
+--- a/lib/power/power_intel_uncore.c
++++ b/lib/power/power_intel_uncore.c
@@ -33,2 +35,2 @@
--		POWER_LOG(ERR, "Fail to write original uncore frequency for "
--				"pkg %02u die %02u", ui->pkg, ui->die);
+-		RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
+-				"pkg %02u die %02u\n", ui->pkg, ui->die);
@@ -38,2 +40,2 @@
-+			POWER_LOG(ERR, "Fail to write original uncore frequency for pkg %02u die %02u",
-+					 ui->pkg, ui->die);
++			RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
++					"pkg %02u die %02u\n", ui->pkg, ui->die);
@@ -48,2 +50,2 @@
--		POWER_LOG(ERR, "Fail to write original uncore frequency for "
--				"pkg %02u die %02u", ui->pkg, ui->die);
+-		RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
+-				"pkg %02u die %02u\n", ui->pkg, ui->die);
@@ -53,2 +55,2 @@
-+			POWER_LOG(ERR, "Fail to write original uncore frequency for pkg %02u die %02u",
-+					 ui->pkg, ui->die);
++			RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for "
++					"pkg %02u die %02u\n", ui->pkg, ui->die);