From nobody Mon Jul 04 18:09:09 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 310BF1C3EB28; Mon, 4 Jul 2022 18:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LcDMp0pLDz4kGB; Mon, 4 Jul 2022 18:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpT2FAQj4bxR+WSXuE/0+PlaObxo55MexwVzChv/rBk=; b=kSD6KTefgEwaxygeodFLhUQBnqoL/gE4rRuWcSBhZgKAgT6z759pdWRPe9CzJFBnf9iNyH dSLOAzxZeLcaOIT/HGW8QFLc+1CMkZOg2pg4edPUQ3gBTPWAuzWqmll4W4hdNAmc4JxDz2 MqIorjA2j3MAvmAjaOpSHZWLPOYkvO/u2pCjoiKhoNxmyeITCpf8pz/dxIOBerbtCTGDKJ U85f231gpmSoe/BJ5bfkIZOoXxIWUZetkcqXr5+xLFbcJgnBakk9iZVGFB1mAK6xk0LyxT N0/UuZBk8VdHlryXNFh5r8GIa/0GaE42ycYIQit9r+7Kbl5zOZmesC7dAQ4zYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB79E16205; Mon, 4 Jul 2022 18:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 264I995x064174; Mon, 4 Jul 2022 18:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264I990c064173; Mon, 4 Jul 2022 18:09:09 GMT (envelope-from git) Date: Mon, 4 Jul 2022 18:09:09 GMT Message-Id: <202207041809.264I990c064173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 78f8ebe0c343 - stable/13 - hwpmc_intel: assert for correct nclasses value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78f8ebe0c343eb43f832adb6061d610b777c6a76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpT2FAQj4bxR+WSXuE/0+PlaObxo55MexwVzChv/rBk=; b=W7n++Z4BTqchSsYTjIx6G/l1CrwRfgkjSZVBQpkxHBfZDIPViTVcevvScBLp01NeyUq6Pa XS7mxPmhs8SRRuQxV3UKV+i0QmOS0esveVe6CbkVZ54+b5bth5sJG92syBSmMd/ZRnrZwo qrmW1XfL7y70KZC/PhgfjCwPdv/6hL+FYBAya+V/dd/3RDs4tgOxwYAEiKQoBS5cv3Gehn 3YVf3TKGNUPwpjiWPFuvJany/bqAzgxgAv/5Xvry7O80bI96X3wowWopU/l+/ZoJvQsPs5 qx9S/V5V2wUzfOpBg8tiCFA/t/wHF88VKRY0VXUM5EJORt/Gci5jm2bCObisaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656958150; a=rsa-sha256; cv=none; b=NeetCGl+LxVahbAF4R/SiYA/c2LNM2K7HJkvcQ3X9AtoYm4vD+1608a6FasJx3r/y1JFsX kH6SadkDTzDBUS76dsOtQEi0481ApyG4ELByaVIGxLz2jUrNwFarncgiW6iuNwpk7GAOhq 3NPvBAvHdwmOMsqTNYiHzpgMhaVR34PmcHmaU2w7ttCjb2sbMKm1+4cRSrL80wa61Le2Pg ZDzo1ZTsG9PI39sqerEfQfKKi3H0248WhS7eyr0P7uRJZ3/HQjzgA3pTLX6pZ0lNx0MlvN nYrTD9fRP8flNg1n3CqKWMxISke4hD4NCmv994oonInkct3xK9e4XorC1x6YRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=78f8ebe0c343eb43f832adb6061d610b777c6a76 commit 78f8ebe0c343eb43f832adb6061d610b777c6a76 Author: Mitchell Horne AuthorDate: 2021-08-04 17:37:05 +0000 Commit: Alexander Motin CommitDate: 2022-07-04 17:48:08 +0000 hwpmc_intel: assert for correct nclasses value This variable is set based on the exact CPU model detected. If this value is set too small, it could lead to a NULL-dereference from an improperly initialized pmc_rowindex_to_classdep array. Though it has been fixed, this was previously the case for Broadwell. Add two asserts to catch this in DEBUG kernels, as it represents a configuration error that may be hard to uncover otherwise. PR: 253687 Reported by: Zhenlei Huang Sponsored by: The FreeBSD Foundation (cherry picked from commit 8399d923a5697b7c194dbd44c33018c94ec42c4e) --- sys/dev/hwpmc/hwpmc_intel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c index 1f05489023c6..2d8377e1a838 100644 --- a/sys/dev/hwpmc/hwpmc_intel.c +++ b/sys/dev/hwpmc/hwpmc_intel.c @@ -276,6 +276,7 @@ pmc_intel_initialize(void) case PMC_CPU_INTEL_IVYBRIDGE_XEON: case PMC_CPU_INTEL_HASWELL: case PMC_CPU_INTEL_HASWELL_XEON: + MPASS(nclasses >= PMC_MDEP_CLASS_INDEX_IAF); error = pmc_core_initialize(pmc_mdep, ncpus, verov); break; @@ -317,6 +318,7 @@ pmc_intel_initialize(void) case PMC_CPU_INTEL_BROADWELL: case PMC_CPU_INTEL_SANDYBRIDGE: #endif + MPASS(nclasses >= PMC_MDEP_CLASS_INDEX_UCF); error = pmc_uncore_initialize(pmc_mdep, ncpus); break; default: