From nobody Wed Apr 8 00:51:02 2026 X-Original-To: dev-commits-src-main@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 4fr4Hv64vwz6Y49D for ; Wed, 08 Apr 2026 00:51:07 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fr4Hv5X7Lz3CTn for ; Wed, 08 Apr 2026 00:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775609467; 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; bh=k3hl7TUKrI4KrJ9nQCROaD9hRba0XFHIMsmqcEJfj2M=; b=OrJbRNbHRG9Ey/kD36pHufCLOrgeST0yHWgHmGSYjmgmrn9O173Fyw69S6nwn5a3mWJBRY +l8dSTUDCHFQ1SdMpX9SXT1WqZ7mrK1Srn7Ia2ZKenibYHgzCTRoJBc2A4KSH2mJY4Y2XV NdowGLFzUjmNOnLHXZkaW8JzNu+iPO1EXxuDm3CSVe8FTSX24TbnxONJrzKflTYeZd1Al5 BxhhMkiPfxHmO/5x2+O1Sd4glIY7+lq54/BK403Q2wyzoCWwyaNuNJcLqlQlZqno1Aviml 0n6ZpoTluNDdp2zow1kyrOpLaRh7SCi5stH3fqukENxhN+B7Sg+n/8nnWT9H8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775609467; a=rsa-sha256; cv=none; b=xIkh+iKDCAXIzVGXJitxpf8fOcqm9H2yrl2aY1JTrs407h3EZrtVjwqZc1ZqgtS5VLlmN7 +Cb+YxGS2MuGdMw3jutThkLPu1PlN8i/i1P+15bzFHmMjc6wZDFCIbZKoGg6H3QzCDe4ks nU5SgOo/5JeOyZiBit5rlpwgj3lwLhCKgAe50H1jCzQ9SXvuNK1FhXJPtxXf2/YNfbF5bO j29LLGAuueY9EDgKQeWHasfzdxUJcwYLfSwlCildoj9h85w9Hsa8PXrkB5baCyd8g7o7zg CN6oJV+GXTENSQU2dkIauCBsK6/icyyNqWB/j9WAjJtpIUsGqVETKGLGrZaYbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775609467; 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; bh=k3hl7TUKrI4KrJ9nQCROaD9hRba0XFHIMsmqcEJfj2M=; b=GeyxLpLmm4+dOr0WzhQFms8Ti7BhInphmTSLBrZSvACp68RdC4qAWg0SWAuIw2R4cVw9SD Hy8vHpNGqW6Fxv01kBJ/1FiOMY0YWUML/rd1Md9hsWpfQdDEvVMkKGhjEQaHJVyTlJ3HO0 iFaP6bF9mqyqHHQT8ax3ItiJ3IZJeNwZeCnSk4JFVE+9zHvstQpSC2SPJSVpxnCeD8mnY9 mexEUh7bfHNFUDMgW9zg/OtqZayCcNBvMuNPpoxhb+bItUucbG/Vkc6mAv5JbdllsfM7A+ 4EkSvMuTpLBY3DoQAknQKzkVdmsvPtcsJxsYZ+wBpdx7LHXhov7vGek++BDyEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fr4Hv50z8z13WM for ; Wed, 08 Apr 2026 00:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 00:51:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Weixie Cui From: Enji Cooper Subject: git: e8053023e7c0 - main - arm64/apple: Fix malloc size for per-CPU arrays in AIC attach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8053023e7c07214a7b0a97f0f087ba02b329157 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 00:51:02 +0000 Message-Id: <69d5a676.38b5b.6d161c3e@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e8053023e7c07214a7b0a97f0f087ba02b329157 commit e8053023e7c07214a7b0a97f0f087ba02b329157 Author: Weixie Cui AuthorDate: 2026-03-31 10:24:08 +0000 Commit: Enji Cooper CommitDate: 2026-04-08 00:50:25 +0000 arm64/apple: Fix malloc size for per-CPU arrays in AIC attach sizeof(*sc->sc_ipimasks) * mp_maxid + 1 is parsed as (sizeof(*sc->sc_ipimasks) * mp_maxid) + 1, so the buffers were one byte short of a full (mp_maxid + 1) element count. Multiply by (mp_maxid + 1) for sc_ipimasks and sc_cpuids. Signed-off-by: Weixie Cui Reviewed-by: kevans, ngie Pull-Request: https://github.com/freebsd/freebsd-src/pull/2112 --- sys/arm64/apple/apple_aic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/apple/apple_aic.c b/sys/arm64/apple/apple_aic.c index c9ce3b4d2165..683339369a87 100644 --- a/sys/arm64/apple/apple_aic.c +++ b/sys/arm64/apple/apple_aic.c @@ -213,10 +213,10 @@ apple_aic_attach(device_t dev) } #ifdef SMP - sc->sc_ipimasks = malloc(sizeof(*sc->sc_ipimasks) * mp_maxid + 1, + sc->sc_ipimasks = malloc(sizeof(*sc->sc_ipimasks) * (mp_maxid + 1), M_DEVBUF, M_WAITOK | M_ZERO); #endif - sc->sc_cpuids = malloc(sizeof(*sc->sc_cpuids) * mp_maxid + 1, + sc->sc_cpuids = malloc(sizeof(*sc->sc_cpuids) * (mp_maxid + 1), M_DEVBUF, M_WAITOK | M_ZERO); cpu = PCPU_GET(cpuid);