From owner-svn-src-head@freebsd.org Tue Oct 22 18:28:59 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 78AD3161ABA; Tue, 22 Oct 2019 18:28:59 +0000 (UTC) (envelope-from luporl@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46yMTl2f1Zz47W4; Tue, 22 Oct 2019 18:28:59 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E981185A8; Tue, 22 Oct 2019 18:28:59 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9MISx7t035954; Tue, 22 Oct 2019 18:28:59 GMT (envelope-from luporl@FreeBSD.org) Received: (from luporl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9MISwK5035952; Tue, 22 Oct 2019 18:28:58 GMT (envelope-from luporl@FreeBSD.org) Message-Id: <201910221828.x9MISwK5035952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: luporl set sender to luporl@FreeBSD.org using -f From: Leandro Lupori Date: Tue, 22 Oct 2019 18:28:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353897 - head/sys/powerpc/ofw X-SVN-Group: head X-SVN-Commit-Author: luporl X-SVN-Commit-Paths: head/sys/powerpc/ofw X-SVN-Commit-Revision: 353897 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Oct 2019 18:28:59 -0000 Author: luporl Date: Tue Oct 22 18:28:58 2019 New Revision: 353897 URL: https://svnweb.freebsd.org/changeset/base/353897 Log: [PPC] Avoid underflows in NUMA domains On POWER8 systems with only one memory domain, the "ibm,associativity" number that corresponds to it is 0, unlike POWER9 systems with two or more domains, in which the minimum value is 1. In POWER8 case, subtracting 1 causes an underflow on the unsigned domain variable and a subsequent index out-of-bounds access. Reviewed by: jhibbits Tested by: bdragon, luporl Modified: head/sys/powerpc/ofw/ofw_machdep.c head/sys/powerpc/ofw/ofw_pcibus.c Modified: head/sys/powerpc/ofw/ofw_machdep.c ============================================================================== --- head/sys/powerpc/ofw/ofw_machdep.c Tue Oct 22 18:05:15 2019 (r353896) +++ head/sys/powerpc/ofw/ofw_machdep.c Tue Oct 22 18:28:58 2019 (r353897) @@ -487,7 +487,7 @@ ofw_numa_mem_regions(struct numa_mem_region *memp, int MPASS(count == 1); OF_getencprop(phandle, "ibm,associativity", associativity, res); - curmemp->mr_domain = associativity[3] - 1; + curmemp->mr_domain = associativity[3]; if (bootverbose) printf("%s %#jx-%#jx domain(%ju)\n", name, (uintmax_t)curmemp->mr_start, Modified: head/sys/powerpc/ofw/ofw_pcibus.c ============================================================================== --- head/sys/powerpc/ofw/ofw_pcibus.c Tue Oct 22 18:05:15 2019 (r353896) +++ head/sys/powerpc/ofw/ofw_pcibus.c Tue Oct 22 18:28:58 2019 (r353897) @@ -403,7 +403,7 @@ ofw_pcibus_parse_associativity(device_t dev, int *doma OF_getencprop(node, "ibm,associativity", associativity, res); - *domain = associativity[3] - 1; + *domain = associativity[3]; if (bootverbose) device_printf(dev, "domain(%d)\n", *domain); return (0);