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 1CFF246BAE for ; Fri, 18 Jul 2025 21:36:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 187AB40611; Fri, 18 Jul 2025 21:36:12 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1379D40B8F for ; Fri, 18 Jul 2025 21:36:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867369; 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=z33Gmmj6o/oq6nQdY3+xpt+evZsh7dY622JzheqvrRo=; b=AdqoQt3mcYVosdazQCkI37Rap673jaBo0GwjJ+lxbQT4NDjeh9/XeYg7hRgbdN+VHDlFUT lalY6biR/UqNsdA/Mnq/GS3hoAIqD6YJ7GRy7L89jZcZpZ7H+G/z3b7oQFQu6j0B3P2z0m Yz86bg85edycpysr4fhkqkgyonGb8xY= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-390-wKk7mS9rPwagd6ioBhgTYA-1; Fri, 18 Jul 2025 15:36:06 -0400 X-MC-Unique: wKk7mS9rPwagd6ioBhgTYA-1 X-Mimecast-MFC-AGG-ID: wKk7mS9rPwagd6ioBhgTYA_1752867365 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8159D1800C36; Fri, 18 Jul 2025 19:36:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ED703180049D; Fri, 18 Jul 2025 19:36:03 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Kevin Laatz , dpdk stable Subject: patch 'power/intel_uncore: fix crash closing uninitialized driver' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:25 +0100 Message-ID: <20250718193247.1008129-91-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KJkAEMTyhUg0tmyLMdt6j65ztdssKB9qh87zsMO8hb0_1752867365 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f2a8997ad18a6c2190ff92013a4ddaeb355e5894 Thanks. Kevin --- >From f2a8997ad18a6c2190ff92013a4ddaeb355e5894 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 15 May 2025 17:58:53 +0100 Subject: [PATCH] power/intel_uncore: fix crash closing uninitialized driver [ 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 Acked-by: Kevin Laatz --- drivers/power/intel_uncore/intel_uncore.c | 35 ++++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) 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 @@ -308,25 +308,26 @@ 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) { - POWER_LOG(ERR, "Fail to write original uncore frequency for " - "pkg %02u die %02u", ui->pkg, ui->die); - return -1; + if (ui->f_cur_min != NULL) { + if (fprintf(ui->f_cur_min, "%u", ui->org_min_freq) < 0) { + POWER_LOG(ERR, "Fail to write original uncore frequency for pkg %02u die %02u", + 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) { - POWER_LOG(ERR, "Fail to write original uncore frequency for " - "pkg %02u die %02u", ui->pkg, ui->die); - return -1; + if (ui->f_cur_max != NULL) { + if (fprintf(ui->f_cur_max, "%u", ui->org_max_freq) < 0) { + POWER_LOG(ERR, "Fail to write original uncore frequency for pkg %02u die %02u", + 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.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:14.168562677 +0100 +++ 0091-power-intel_uncore-fix-crash-closing-uninitialized-d.patch 2025-07-18 20:29:10.996907533 +0100 @@ -1 +1 @@ -From 74c4b081825123350578f18dc838ec0bf69ba03b Mon Sep 17 00:00:00 2001 +From f2a8997ad18a6c2190ff92013a4ddaeb355e5894 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 74c4b081825123350578f18dc838ec0bf69ba03b ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org