From nobody Thu Aug 6 23:21:39 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 4hGNZs0Mxnz6nRRM for ; Thu, 06 Aug 2026 23:21:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGNZr1c09z3XlR for ; Thu, 06 Aug 2026 23:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786058500; 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=9aJjxZyBAj3B1ELlNLJ+FTtS4DodnS3sDfTLfzazCrw=; b=WVcvFmBrrRe46fIgKOEK8+HLMAd7Tt0/QUl5hRbgdBpjRJ/NMcKtq1e6IoqXjoFUMQN67I bX6V29+e28uvMoJ3WJ4sgSE/zDAnNf/DI2weMDckxeRGDdNw3Kd88FEU24EFqiV3/bEoXZ HSsvxbj40wWu/mTiSGfLGKvlD0LaV7TvF4a0/pLLQ0HE1ceFjhkPWm/AVulv6Zw49Oid/V ARAKsLrllMOZsvWSppApeYwULWhYmDnYRFea40NndUpMJn3AZhVn6LvxvLxDNCkv8xMbEN 8MCUsJ37hKJAg6OBnxr6fIRlo5V6PfCxVDAuCQtsIl9yQtuOJGfebvRu6DzP3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786058500; a=rsa-sha256; cv=none; b=rppnQrve1DsE12ffMFZdP63v+PogrEp7oC2yiAaburTAXG5aNO/4SPWo5y9ZthG8VMrBKa S3nPVIbual8unWIZr16HWezTuneSGVC0xzHn75yK5yHP51QIgSRu7JDPv8xyX7tuhZu28A nf6xP9OMOeMhf6XQMXlUPAyqZWKHMcHt3aj3mLexvzWV/TmBeTzo1jZke53/ahJRMCSBhK diMsHCduc3BDvC1yjvQWCzYrwY/xENrkgMkaYChok7g33sCAOcS+bd7vMw28UaYIm+bopD 8jNEGeMnt6R/6Yu+vn+dnrZyebB4b05E1ZlVJCMZCapO86lqNsRs2TZ+yqJsyQ== 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=1786058500; 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=9aJjxZyBAj3B1ELlNLJ+FTtS4DodnS3sDfTLfzazCrw=; b=xQO4SdD/bTXbC6G5+fgPt9A1yHlD92+QXFquk4cU1Xg1PgRW8kUPG1ScJNX8csuQmis2i6 m6ojqcXfIQWxcXlytKNEFta8huWfXjCRTEqS80uLhTwo4pVSk6RKFOs8wcEdfEGsUVOrju JvZ9Ks7+HEcZFSGJdoG8qmcgkT8MnbfyPW7GZJoZKxFZGqlZMC7g95wEaGcTgp0rBBSbUx FNQQEG4fvXGMlaRwVGeqPL/qQmF3QSYpzkdkZTVFXwD0fBSXUYm079wRtT8thCpKxTFYs0 FmkuJudBMboGtpbBb1IVi7CEph1t5lJgAdoWkIMBykstjUJnXrQHCheQwmtKrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGNZq5b7Yzj6d for ; Thu, 06 Aug 2026 23:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 251c5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 23:21:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 387634c880be - stable/14 - kern: syscall_thread_enter() cannot fail 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 387634c880bec9a24388529c7653b52ebea8f828 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 23:21:39 +0000 Message-Id: <6a751703.251c5.5352c68c@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=387634c880bec9a24388529c7653b52ebea8f828 commit 387634c880bec9a24388529c7653b52ebea8f828 Author: Kyle Evans AuthorDate: 2026-06-30 19:12:10 +0000 Commit: Kyle Evans CommitDate: 2026-08-06 22:53:07 +0000 kern: syscall_thread_enter() cannot fail Attempting to handle the error gracefully can easily result in missing SIGSYS, so this was made to always succeed in 39024a89146 ("syscalls: fix missing SIGSYS for several ENOSYS errors") and returns the nosys entry on failure. Drop the pretense of returning an error and clean up a few dead error paths. Reviewed by: kib, markj (cherry picked from commit eca26803d880060555393ab89b44b967cd467a0e) --- sys/kern/kern_sig.c | 8 ++------ sys/kern/kern_syscalls.c | 5 ++--- sys/kern/subr_syscall.c | 6 +----- sys/sys/sysent.h | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 88c93b98b646..cf71dfc89c3d 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2703,7 +2703,7 @@ ptrace_syscallreq(struct thread *td, struct proc *p, struct sysent *se; register_t rv_saved[2]; unsigned int sc; - int error, nerror; + int nerror; bool audited, sy_thr_static; sc = tsr->ts_sa.code; @@ -2747,12 +2747,8 @@ ptrace_syscallreq(struct thread *td, struct proc *p, audited = AUDIT_SYSCALL_ENTER(sc, td) != 0; if (!sy_thr_static) { - error = syscall_thread_enter(td, &se); + syscall_thread_enter(td, &se); sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0; - if (error != 0) { - tsr->ts_ret.sr_error = error; - return; - } } rv_saved[0] = td->td_retval[0]; diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index 2dfe162f6c2e..1a5611d3986d 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -89,7 +89,7 @@ syscall_thread_drain(struct sysent *se) pause("scdrn", hz/2); } -int +void syscall_thread_enter(struct thread *td, struct sysent **se) { uint32_t cnt, oldcnt; @@ -101,11 +101,10 @@ syscall_thread_enter(struct thread *td, struct sysent **se) oldcnt = (*se)->sy_thrcnt; if ((oldcnt & (SY_THR_DRAINING | SY_THR_ABSENT)) != 0) { *se = &nosys_sysent; - return (0); + break; } cnt = oldcnt + SY_THR_INCR; } while (atomic_cmpset_acq_32(&(*se)->sy_thrcnt, oldcnt, cnt) == 0); - return (0); } void diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 139a4df57f13..fecc2ca5dcdf 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -146,12 +146,8 @@ syscallenter(struct thread *td) if (__predict_false(AUDIT_SYSCALL_ENABLED() || SYSTRACE_ENABLED() || !sy_thr_static)) { if (!sy_thr_static) { - error = syscall_thread_enter(td, &se); + syscall_thread_enter(td, &se); sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0; - if (error != 0) { - td->td_errno = error; - goto retval; - } } #ifdef KDTRACE_HOOKS diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index c0e5a265fd32..353d5454ec71 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -319,7 +319,7 @@ struct nosys_args; int lkmnosys(struct thread *, struct nosys_args *); int lkmressys(struct thread *, struct nosys_args *); -int syscall_thread_enter(struct thread *td, struct sysent **se); +void syscall_thread_enter(struct thread *td, struct sysent **se); void syscall_thread_exit(struct thread *td, struct sysent *se); int shared_page_alloc(int size, int align);