From nobody Mon Jun 15 19:15:06 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 4gfKZL5knDz6hnZJ for ; Mon, 15 Jun 2026 19:15:06 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfKZL4syRz3MDW for ; Mon, 15 Jun 2026 19:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781550906; 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=yTtE6+1BzIWRV/RW44yMld51USQ91QCqpAPpmHkj5Kc=; b=OQcDKyT7oqCjzTJtny9zTg3sN5iXY1mZuw1zCslsotVaaIeVBQQEpimLaiokJX03w2UTSJ PXjZw/+ZRZHfkn+u5K+6w3n3YAad3VAFwFq2a/0GlHBSHKZ7fs1RQiSnrzf7U2PEGocyNm dtxpwufWiS/45xhjTH/b+aoWGAQcOqC76BLHCiUjglC3NmzLJEcsXCYmCGrVhtkRqFBP9R ElMQ0otd8CYvgZjcuT5giSwrEldOlibofJW3t8X3bWwSfynFz4It447w9D1OWn2cdSEOfe 8hGDEm7oXf5ORdutVbOHkYE6g3keXPc/+r23HWT+UwSZ7Ztcleg2Tt0HYq0Trg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781550906; a=rsa-sha256; cv=none; b=vpuX0SpobEafaZewfQVg99U7TaC/wEngpOU+7YELWVC7O3QC+MbQW+olZumleG9AC3B4BZ X5C8KpXko9i3GRgzTxaFKUrpyEIIHCohL6JDGJ6Q/Tt5Lwt8loNUxdJ9HAZ7tMsYwEk0et Pr3j7QZg7f7h4mDg7hq72Ka8ThyYt+ALzABccBzkcGt6CncwV9SnrGMrjww/On5GITjzcV tbmkCK5h2HhJbP7dARZ+Hg/o3op0I/eP2Hg8Ip5p5MeMDOo2ydox7CIyIub2YgWiGCoLp8 ftRiRVAA7OZNUWbVI6aK2ChlKT86OziIA5ch1dGLiIWP6irjlzvJSa7XX55SYw== 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=1781550906; 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=yTtE6+1BzIWRV/RW44yMld51USQ91QCqpAPpmHkj5Kc=; b=IG89JonysWJmBBtA5BxqPq95Gb7ZB9s/UPbNOhvPzwPorsgcHntAalKRMNMefmYhyQvDH5 RbO8wrUVj31euX4gGyXaC1p4RZmj0dWw7Ylqy9vfaLRhChO3yvGUAfNmXX7yn+TtCslB/9 FD0w62WfT744nNxwxG6X3nbHvaKwo9ZKuPXOb5amGihfD5MciUHZJY+Q0gPCPvW7UCf6hY YQMt6aZSthGbnK6chZK4AOWBYd7fH2wIb0heFmWE5cpAUQwPWQiyt4Bfy22hfXpTxy8LtW OlRKQGRa116Bt4DOFXNY7D9QHpxiYiB1ArXtEAUrEU1zSYXsWwAbT0x9VEqf4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfKZL4QT7z175h for ; Mon, 15 Jun 2026 19:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26134 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Jun 2026 19:15:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3f386ea741ca - stable/15 - vmm/arm64: Compile vmm_nvhe.c without SSP 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3f386ea741caee329100b37cd5323dd478a35f64 Auto-Submitted: auto-generated Date: Mon, 15 Jun 2026 19:15:06 +0000 Message-Id: <6a304f3a.26134.23c5e67e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3f386ea741caee329100b37cd5323dd478a35f64 commit 3f386ea741caee329100b37cd5323dd478a35f64 Author: Mark Johnston AuthorDate: 2026-05-22 16:10:04 +0000 Commit: Mark Johnston CommitDate: 2026-06-15 19:14:50 +0000 vmm/arm64: Compile vmm_nvhe.c without SSP This file implements a set of EL2 hypercall handlers and is used to switch between guests and the host kernel when VHE is not in use. There is no SSP runtime available there. Reported by: Jenkins Fixes: 8deebce931fa ("kernel: Enable -fstack-protector-strong by default") (cherry picked from commit bed77cf7c213c3f93a0dc099e4b46c078495a328) --- sys/conf/files.arm64 | 2 +- sys/modules/vmm/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 1f3a072fefdb..8db00084e651 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -134,7 +134,7 @@ arm64/vmm/vmm_nvhe_exception.S optional vmm \ no-obj arm64/vmm/vmm_nvhe.c optional vmm \ dependency "$S/arm64/vmm/vmm_hyp.c" \ - compile-with "${NOSAN_C} -fpie" \ + compile-with "${NOSAN_C:N-fstack-protector*} -fpie" \ no-obj vmm_hyp_blob.elf.full optional vmm \ dependency "vmm_nvhe.o vmm_nvhe_exception.o" \ diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index dcb401d2026d..4084822c4f43 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -52,7 +52,7 @@ vmm_nvhe_exception.o: vmm_nvhe_exception.S vmm_hyp_exception.S ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} -o ${.TARGET} -fpie vmm_nvhe.o: vmm_nvhe.c vmm_hyp.c - ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} \ + ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*:N-fstack-protector*} ${.IMPSRC} \ -o ${.TARGET} -fpie vmm_hyp_blob.elf.full: vmm_nvhe_exception.o vmm_nvhe.o