From nobody Tue Nov 03 09:02:09 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 4jJjJ23xrZz6yPqM for ; Tue, 03 Nov 2026 09:02: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjJ20QCQz4KJx for ; Tue, 03 Nov 2026 09:02:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696530; 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=wzjKgafZ1Zm6klT6+S9XlZJk9YXVj1uyC8lvjBvcnqg=; b=uXDz/AwHoQ2n4UBEJISGHYkPQdFBp5w8KFULI7Mt+YSe6Wrm4yVfFE6zbzKqLYXUK5K/GN SOInO/UJ4Lg5eIcS0IVqjRCBNWswR5FTr5y7IGo3T/PmFo19q1VMWb9Qmv1cSyY85l6Pst 4/z61q8vw9Hwg9B+HR1V2XBIkmQLotXk+zU+jM0DeLTqeifXAzC6eaCSjiz04iwSHDoSyY /Y066Kfg8I4sFLyJODZGTpFoykU1Ul1n4qTNhAxmtJj0wxth7D32TVC2mlVUi2BsZCLadf Ly8E66UFPhgd2O0Q8l7R0cHDyZbUUpaEy/VSioRY0Oy8yL4XKyc9oIwgIZwRsw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696530; b=sHrea+NjszSMzxlN9hfkSBsGJDobjnFluPvofXMh+aYsdYRgtT3tpEa/OeVJD74/Qr7s/v zEfYYeXjvYVUT084GwFBojvGA5wEEYhOB6zVKsE/Y+ivWi77MMk9/hrg2X4jvuHdbSwj8a CLvHvLGHN7txvNFeco7GAXfhVA+oefi+lUZExfnqR5RvKcX5z5JMkWRLwjJNyUIuUt4nbu cjQzBzIfmC1OjYX83X69pAlbFVrfMtS/3rAiSPf8LcHt3sKO2swyCMi6/YnQ2xNY+GM2F6 V97satIgx9f1roIe9FTH+6fQA/38sSI+PGTXywaVrn+FBSfYniwsiI/4Ds+3JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696530; 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=wzjKgafZ1Zm6klT6+S9XlZJk9YXVj1uyC8lvjBvcnqg=; b=xUVyhgT9luVYMOCixDexCebYZy3o8SZ0JGSLT/UOdUQYw+o0A/H+3fmbnb8ZMyQQO6+DlM 07ljDEQYZwX5jkVCts5kinxAZaS0326Ij+rIr/aYg7zDSptlI+1bUTMNZFDMbi2Htl6+WN mcsts+W7M9f09MAO6w3MjMU7cJ1l0MQgvHcdfCXGNDrX1UIMmLTgRLK3a43RBUouLUIpCb Ad/y5UF+QTwMMxtJ6X3b+9kXprltF2c4Y9Pclp6f/P409ravazLXDZS51gTfVDRDmgW0qT 8xVdLItoIxl21LOuh7b80ojzvQ/X6lvo5l90RQ7JsMQ+S9LJPbwDPbC+l5Jlbg== 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 4jJjJ2013qz1P9R for ; Tue, 03 Nov 2026 09:02:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44912 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 74e7965ac7e6 - stable/15 - amd64: strictly enforce the caller's mode for FRED 64bit syscall handler in C List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 74e7965ac7e646c77b2ef79b765f81a6551f0dcd Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:09 +0000 Message-Id: <6ae9a311.44912.d9a5299@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=74e7965ac7e646c77b2ef79b765f81a6551f0dcd commit 74e7965ac7e646c77b2ef79b765f81a6551f0dcd Author: Konstantin Belousov AuthorDate: 2026-10-28 00:45:33 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:15 +0000 amd64: strictly enforce the caller's mode for FRED 64bit syscall handler in C (cherry picked from commit dcc5adb27e3b00f003c2256a9e9aa2fcc20c4d32) --- sys/amd64/amd64/trap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index f6b8c904071e..ba0b8a5a233e 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -1670,7 +1670,8 @@ trap_fred_u(struct trapframe_fred *frame) case TF_FRED_EVINFO2_TYPE_SYSCALL: /* Excessive */ enable_intr(); - if (vec == TF_FRED_EVINFO2_VEC_SYSCALL) { + if (vec == TF_FRED_EVINFO2_VEC_SYSCALL && + (frame->tf_idt.tf_fred_evinfo2 & TF_FRED_EVINFO2_LM) != 0) { frame->tf_idt.tf_err = fred_inst_len(frame); td->td_frame = &frame->tf_idt; amd64_syscall(td, (frame->tf_idt.tf_rflags & PSL_T) !=