From nobody Tue Jan 27 19:15:46 2026 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 4f0w9G6VcPz6QJFK for ; Tue, 27 Jan 2026 19:15:46 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0w9G2dZPz3CyR for ; Tue, 27 Jan 2026 19:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541346; 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=IMnmThysG6mTiJSIjp2nd5FIucM0eOvw0/wPo0LlqMw=; b=PUmVQAONTmgOdn03GOsS0myaj/o7Qs/oXiNQFP3L46VWx8GRCftJMGBuGdDaxiGMotrJAc Cbuq2nGWLP+skrMUNzF92i5P1cpPW6CMI4MtRXCz2wIbU839vSbjZUaGgMnT+zt3UG7+wi UkBBCPuRHfL3X595c3+XQUap++1y3by4Uqd0pss70gPBvC9028eAwHFaeSUWCpeZcNKjq7 1xa839HKFDS+Muy3X/aPm6EBlF5uvilfCvQCEPZY9+Cmmy3tDil/v9avBfQ9uCOiq8infc I8oNCQ5VY1cM2Nh1miqV5y3LNmnckHjSYdnxKNjWSSv8+/VQkT/2wE0qI4e9VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541346; 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=IMnmThysG6mTiJSIjp2nd5FIucM0eOvw0/wPo0LlqMw=; b=vauS7IoExmyudXFLVHHbATLehBU9BiDCS/nuhwEFgJ5HhmJAuDyloldrKeZuIRU6CkVZPK JnL1pfsHi3Kr25Wcvz+Mek2kIfzGEeTdllCFT7D6vH8pHWkyLcRIhFfTpJ6SMD42y74/0D ruKZNQjjczBLuY4ZEfWXv0yULZUsVwAeId41FQohjBmPQI4smxOAiZxtmredcR2iZMtEQJ IhGqDCTsLxX60MIrQDoYluJiPZXjoZrQxX2bE1CODXVQUU6FZzIBLrzGiu2BsH86tjihMm cmQftSyQ7z2BHVdZxqRk8maFtMRH7aLKwEinolPqN3uuqsA6aRG778mayooLTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769541346; a=rsa-sha256; cv=none; b=Gwn2muMPQnyVz0KDVBuKVEQhGDtfKZ/2fsk1d5m1LzIXZEXan6pMaKQtqhz2mKM7kMxb4+ RELo9hqtm+OLR/uP3yqUsRhOQC/fvTXyfdM4qZFCZpFHNP3cBrAYCJ/0atq+XFPSZ2OyIt KxNGZlr+nXxYoxUPFQAYGG/tzBStWjfqcL+3ixfk7Kb6qm/4ZH3R1+fGxoGGKaQhweoEuy rT4oJQ9TTFmiYJsY6MCDxhUhwaGaUe36zdc1wWj8EJAAZH1L2tk+ZvznbpqqnWbIlBFft9 VXCfLWwBgIJ7UCw3qQWNA/y8UpgNMXib/qzgOLDuH0vpRJZGhEccOPOFoiRO/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0w9G28Pnz4NX for ; Tue, 27 Jan 2026 19:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 19:15:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Turner From: Mark Johnston Subject: git: 679b1a810e0e - releng/15.0 - arm64: Correctly align the SVE signal context 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 679b1a810e0e0d7fb4ea087a33af3b18408812b8 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 19:15:46 +0000 Message-Id: <69790ee2.235d5.749f2a6c@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=679b1a810e0e0d7fb4ea087a33af3b18408812b8 commit 679b1a810e0e0d7fb4ea087a33af3b18408812b8 Author: Andrew Turner AuthorDate: 2026-01-06 10:35:55 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 14:43:40 +0000 arm64: Correctly align the SVE signal context The SVE signal context needs to be correctly aligned. Fix this by creating a new macro to calculate the needed size to provide this alignment, and use it when setting and checking the saved SVE signal context. Approved by: so Security: FreeBSD-EN-26:02.arm64 Reported by: cperciva Reviewed by: cperciva, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54396 (cherry picked from commit a9e77eb7016df70723c208fc09fbd01ec23a732d) (cherry picked from commit 683decf362ce0bbfd9ff917618f3e181bc8f1cd0) --- sys/arm64/arm64/exec_machdep.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index 7c50dc93fdb4..207e10ede96c 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -60,6 +60,10 @@ #include #endif +#define CTX_SIZE_SVE(buf_size) \ + roundup2(sizeof(struct sve_context) + (buf_size), \ + _Alignof(struct sve_context)) + _Static_assert(sizeof(mcontext_t) == 880, "mcontext_t size incorrect"); _Static_assert(sizeof(ucontext_t) == 960, "ucontext_t size incorrect"); _Static_assert(sizeof(siginfo_t) == 80, "siginfo_t size incorrect"); @@ -585,8 +589,7 @@ set_mcontext(struct thread *td, mcontext_t *mcp) buf_size = sve_buf_size(td); /* Check the size is valid */ - if (ctx.ctx_size != - (sizeof(sve_ctx) + buf_size)) + if (ctx.ctx_size != CTX_SIZE_SVE(buf_size)) return (EINVAL); memset(pcb->pcb_svesaved, 0, @@ -729,7 +732,7 @@ sendsig_ctx_sve(struct thread *td, vm_offset_t *addrp) { struct sve_context ctx; struct pcb *pcb; - size_t buf_size; + size_t buf_size, ctx_size; vm_offset_t ctx_addr; pcb = td->td_pcb; @@ -740,14 +743,15 @@ sendsig_ctx_sve(struct thread *td, vm_offset_t *addrp) MPASS(pcb->pcb_svesaved != NULL); buf_size = sve_buf_size(td); + ctx_size = CTX_SIZE_SVE(buf_size); /* Address for the full context */ - *addrp -= sizeof(ctx) + buf_size; + *addrp -= ctx_size; ctx_addr = *addrp; memset(&ctx, 0, sizeof(ctx)); ctx.sve_ctx.ctx_id = ARM64_CTX_SVE; - ctx.sve_ctx.ctx_size = sizeof(ctx) + buf_size; + ctx.sve_ctx.ctx_size = ctx_size; ctx.sve_vector_len = pcb->pcb_sve_len; ctx.sve_flags = 0;