From nobody Mon Jun 15 00:20:30 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B568F38F936; Tue, 7 Apr 2026 07:06:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775545605; cv=none; b=jFU8if2luXP42hOyuFJZ8VXt0LAAji83AP64FpQuDS5mgUHdRfk4vdBmt7rv9cza14cJBgsevlBBgSSTCKxx3q4xmg8gaBWw3Q5B/myCpokCTPB9TO592WS3gjr4id/scY124Xhjn59/8PvtAVtVnZVkY9TL//e4B/mHbPOs+/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775545605; c=relaxed/simple; bh=fQRAYALcjLIMcBI/68/mGikGggLQ+Zfg+RWAe2WWT68=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=MKYkXPiUG+EyGFcMY5x61aMTQQRx/b7YAUL88Uc1xL8RvMuCRTjepPnHDez9Mk9gVVyLvQKtFiV6bB2NM36c7m4idbiABQDOpELhz7gnlCH0qfE4HadD4YTG6J6JtWQBKxo0cfZs7FhRBO3nEX0kjS5tzgx1IuIw0rJ5TGCJU4c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ju4DYe1M; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=1L97DdxC; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ju4DYe1M"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="1L97DdxC" Date: Tue, 07 Apr 2026 07:06:41 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1775545602; h=from:from:sender:sender:reply-to: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=JMFWtrMRo+5dXIrOnk/VvDuw0A2oZsEfYtV70DRuiyM=; b=ju4DYe1Mdtpb+rAa4Yq8eq8e5aUJma6g+9vPN5XZv7XKYQEzRa35e+ksVmGHQ2ig+ArtIr ccJP0+A68IGQ+4PB1nUfKiO6TScLVHF+knAgapF354gZ9zimErnvuRJiW/vB5Am1ux4uKs qRWH/8YXlSMJiy+wiWM9oH+ttdTshoiGdFRBTFeGNJSas229E/+ji5vN3Dir9m30wqnX9N 9WS/VkxqkIPTX4+MNl+5k/F/XkTO+hfz0xJye8uGo941TZG9yxyPPOlB4PRbQpX7mgiK5m nbQ6uDhlOiaRmAuKlxoRdpJGNiyqqUpdJbhw6xTjbypcQqoVHV6RVHkKRi0sag== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1775545602; h=from:from:sender:sender:reply-to: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=JMFWtrMRo+5dXIrOnk/VvDuw0A2oZsEfYtV70DRuiyM=; b=1L97DdxCGO4VplXYzjg0yhGrljSaPBksXUkppNq5v9KGlP3sOYvXOed0zceUS/LttuJaGO rXmKGieeI+qTxqAw== From: "tip-bot2 for Zide Chen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/urgent] perf/x86/intel/uncore: Fix iounmap() leak on global_init failure Cc: kernel test robot , Zide Chen , "Peter Zijlstra (Intel)" , Dapeng Mi , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260313174050.171704-2-zide.chen@intel.com> References: <20260313174050.171704-2-zide.chen@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177554560104.226963.14724375304082114742.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/urgent branch of tip: Commit-ID: e2a39d1a88f00ed83ebc7a19b7673d4ffd50b173 Gitweb: https://git.kernel.org/tip/e2a39d1a88f00ed83ebc7a19b7673d4ff= d50b173 Author: Zide Chen AuthorDate: Fri, 13 Mar 2026 10:40:47 -07:00 Committer: Peter Zijlstra CommitterDate: Tue, 07 Apr 2026 09:05:29 +02:00 perf/x86/intel/uncore: Fix iounmap() leak on global_init failure Kernel test robot reported: Unverified Error/Warning (likely false positive, kindly check if interested): arch/x86/events/intel/uncore_discovery.c:293:2-8: ERROR: missing iounmap; ioremap on line 288 and execution via conditional on line 292 If domain->global_init() fails in __parse_discovery_table(), the ioremap'ed MMIO region is not released before returning, resulting in an MMIO mapping leak. Fixes: b575fc0e3357 ("perf/x86/intel/uncore: Add domain global init callbac= k") Reported-by: kernel test robot Signed-off-by: Zide Chen Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Dapeng Mi Link: https://patch.msgid.link/20260313174050.171704-2-zide.chen@intel.com --- arch/x86/events/intel/uncore_discovery.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/x86/events/intel/uncore_discovery.c b/arch/x86/events/int= el/uncore_discovery.c index 12e259a..427939b 100644 --- a/arch/x86/events/intel/uncore_discovery.c +++ b/arch/x86/events/intel/uncore_discovery.c @@ -264,6 +264,7 @@ static int __parse_discovery_table(struct uncore_discov= ery_domain *domain, struct uncore_unit_discovery unit; void __iomem *io_addr; unsigned long size; + int ret =3D 0; int i; =20 size =3D UNCORE_DISCOVERY_GLOBAL_MAP_SIZE; @@ -273,21 +274,23 @@ static int __parse_discovery_table(struct uncore_disc= overy_domain *domain, =20 /* Read Global Discovery State */ memcpy_fromio(&global, io_addr, sizeof(struct uncore_global_discovery)); + iounmap(io_addr); + if (uncore_discovery_invalid_unit(global)) { pr_info("Invalid Global Discovery State: 0x%llx 0x%llx 0x%llx\n", global.table1, global.ctl, global.table3); - iounmap(io_addr); return -EINVAL; } - iounmap(io_addr); =20 size =3D (1 + global.max_units) * global.stride * 8; io_addr =3D ioremap(addr, size); if (!io_addr) return -ENOMEM; =20 - if (domain->global_init && domain->global_init(global.ctl)) - return -ENODEV; + if (domain->global_init && domain->global_init(global.ctl)) { + ret =3D -ENODEV; + goto out; + } =20 /* Parsing Unit Discovery State */ for (i =3D 0; i < global.max_units; i++) { @@ -307,8 +310,10 @@ static int __parse_discovery_table(struct uncore_disco= very_domain *domain, } =20 *parsed =3D true; + +out: iounmap(io_addr); - return 0; + return ret; } =20 static int parse_discovery_table(struct uncore_discovery_domain *domain,