From nobody Wed Dec 17 12:18:39 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 708F3C07D5A for ; Mon, 27 Nov 2023 18:52:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232496AbjK0Swp (ORCPT ); Mon, 27 Nov 2023 13:52:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231339AbjK0Swm (ORCPT ); Mon, 27 Nov 2023 13:52:42 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2264D5A for ; Mon, 27 Nov 2023 10:52:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701111168; x=1732647168; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2N32HLIztMEKcqTYWVW9WXnQpGFYXa8KEDFLkMLSGiU=; b=IwiI9jsK5zpNcnZR7hLRSbf9NHn2IS0m4ZPnK3Z+ApULVI5qDRwiT9Je jpe+/YtsYmaUcUFGow8qr02DSofVqTPx71tmyL9Ei41jRBO7CHyLzWoMG bG0oNR94cp5tA30pMSiDkK2+vVkJvpUTwpqYGR/h1L7DmKX3SWzv5nf3T sP8XBTZVBd2+zRY2Jngb/UnjwqTDY447Z/dLVt1q5CwUj+CMtABSkDoe/ 9d4zWfgXLII+Efu5gEvXwIknyXeREMNpiUdW7EYqW7vpMOZxnDHHjqjcm O7jyl2MrFFTx8O/2V2O8VrCeTPc2HYtUE6Ix0LIflU1lJNSZHFZ/Za5HJ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="457099429" X-IronPort-AV: E=Sophos;i="6.04,231,1695711600"; d="scan'208";a="457099429" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 10:52:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="772021666" X-IronPort-AV: E=Sophos;i="6.04,231,1695711600"; d="scan'208";a="772021666" Received: from jfdev013vml03.jf.intel.com ([10.165.161.72]) by fmsmga007.fm.intel.com with ESMTP; 27 Nov 2023 10:52:47 -0800 From: alexander.antonov@linux.intel.com To: peterz@infradead.org, linux-kernel@vger.kernel.org Cc: kan.liang@linux.intel.com, kyle.meyer@hpe.com, alexey.v.bayduraev@linux.intel.com, alexander.antonov@linux.intel.com Subject: [PATCH v2 1/2] perf/x86/intel/uncore: Fix NULL pointer dereference issue in upi_fill_topology() Date: Mon, 27 Nov 2023 10:52:45 -0800 Message-Id: <20231127185246.2371939-2-alexander.antonov@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231127185246.2371939-1-alexander.antonov@linux.intel.com> References: <20231127185246.2371939-1-alexander.antonov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Alexander Antonov Get logical socket id instead of physical id in discover_upi_topology() to avoid out-of-bound access on 'upi =3D &type->topology[nid][idx];' line that leads to NULL pointer dereference in upi_fill_topology() Fixes: f680b6e6062e ("perf/x86/intel/uncore: Enable UPI topology discovery = for Icelake Server") Reported-by: Kyle Meyer Tested-by: Kyle Meyer Signed-off-by: Alexander Antonov --- arch/x86/events/intel/uncore_snbep.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/u= ncore_snbep.c index 8250f0f59c2b..49bc27ab26ad 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -5596,7 +5596,7 @@ static int discover_upi_topology(struct intel_uncore_= type *type, int ubox_did, i struct pci_dev *ubox =3D NULL; struct pci_dev *dev =3D NULL; u32 nid, gid; - int i, idx, ret =3D -EPERM; + int i, idx, lgc_pkg, ret =3D -EPERM; struct intel_uncore_topology *upi; unsigned int devfn; =20 @@ -5614,8 +5614,13 @@ static int discover_upi_topology(struct intel_uncore= _type *type, int ubox_did, i for (i =3D 0; i < 8; i++) { if (nid !=3D GIDNIDMAP(gid, i)) continue; + lgc_pkg =3D topology_phys_to_logical_pkg(i); + if (lgc_pkg < 0) { + ret =3D -EPERM; + goto err; + } for (idx =3D 0; idx < type->num_boxes; idx++) { - upi =3D &type->topology[nid][idx]; + upi =3D &type->topology[lgc_pkg][idx]; devfn =3D PCI_DEVFN(dev_link0 + idx, ICX_UPI_REGS_ADDR_FUNCTION); dev =3D pci_get_domain_bus_and_slot(pci_domain_nr(ubox->bus), ubox->bus->number, @@ -5626,6 +5631,7 @@ static int discover_upi_topology(struct intel_uncore_= type *type, int ubox_did, i goto err; } } + break; } } err: --=20 2.25.1