From nobody Sat Jul 12 01:44:27 2025 X-Original-To: dev-commits-src-all@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 4bfBG371Vrz617qs; Sat, 12 Jul 2025 01:44:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBG358DYz3G2g; Sat, 12 Jul 2025 01:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284667; 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=pk/qVi2eQiBfFNgwOLpdcepAPBicsaog8P9URbF8vGw=; b=v1bT4ak6wD3MtsrzWG5Jv4+TiNaycjI8lbrcCA59qgV8K1yOWlq8OcNE4EsFnMocMXwknP cLKNG7u5y1lyeHg0oMbZ6n1OWlVxdGrc8iApY1U2GYWIPC4ZBXYlGzK2FYksz4uBFauP9Z B9lwkAFkHx+YpIZUwjNWOL+w3GeafIXE54CnFhw3kgvcK6tx1WKccrpWEfGVOpJ3uAPo+c u9YCBRvf7k5qFlv37nEUMVtkC1cAeAxI3UdwkYk4msMGooVrkyfe8WPOXmtbALQLe7k3Xa wbold5+8GC0rZ1Opkz0Lwp4H0U0QAev369S3tlyQ8zwbOEkEiNjF2B2Vy2NFZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284667; 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=pk/qVi2eQiBfFNgwOLpdcepAPBicsaog8P9URbF8vGw=; b=TkLHlxjdCkQWm8g/JarhbSSpv+BH3wFINiC/jN0NyYfv4iEuUp1MM5vavgjKoW25lGMIme 6EBxThnWKLNHI4v6nFe+odlRY3h1INCiWJaODZnsrSELE/NzzUD/Z78xKqHen0FTI1Dr+/ gXBcBNvqBfpYclirW09tFtFr9IZjyd4OfMX7MnJBKd6xwqhQfFuGZIEn/W8dJBAekSyzpD UPHwpccOwuN+RK50WCI6wKnHoCCKoDq17KMf2MmDg5wHT+RSU52jjPxfqwG9f5X6eyUmqn IYQ9R1YL5dSJkQIGTB0qLbIC6ZS7X8PKGSQ/xX+GeRolaZjoyH5s6o6HcHAhUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284667; a=rsa-sha256; cv=none; b=XWnfejgMFe6j1u7UWt39krZ289A4YUOxUqV0WMo5mrhdtMUNWDFjgH8EUaLIewIFEhXG0O L7DXAkGrEEam0bficKPcUHS5w2Nq1mzOS/h+mzhN6ypcs1EYINjXoRF3yzt05O5Id9MEty xIKQT6GveKI4QxPs9dMwykRyL/ZtQiwMUINWTPiHLpIDX9AolSF9nk5Mc0nD3hr0/EAvUM ANvV3lhSadEXVnJwMFSaeu+e9yAL03nyRYXtGQY87TppgJxzI40z1BLtIIXeytlnAeA166 2mDwRS6WPOknPo7wGEMNaT3SEVvdg5m4Xz1VhJugKcelLShTXhdyntn1ft7eMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBG34kksz11yd; Sat, 12 Jul 2025 01:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56C1iR4B050742; Sat, 12 Jul 2025 01:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iR2k050739; Sat, 12 Jul 2025 01:44:27 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:27 GMT Message-Id: <202507120144.56C1iR2k050739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 98e530b33891 - stable/14 - kern: add kern_nosys() and use it instead of type-punning the sys_nosys() arg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 98e530b33891735cc573c538a90cdfde7ae99a96 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=98e530b33891735cc573c538a90cdfde7ae99a96 commit 98e530b33891735cc573c538a90cdfde7ae99a96 Author: Konstantin Belousov AuthorDate: 2025-07-06 12:18:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:35 +0000 kern: add kern_nosys() and use it instead of type-punning the sys_nosys() arg (cherry picked from commit 26061e4e542d220c577fb3437a9a9f108dc27698) --- sys/kern/kern_sig.c | 9 +++++++-- sys/kern/kern_syscalls.c | 5 +++-- sys/kern/sysv_msg.c | 2 +- sys/kern/sysv_sem.c | 2 +- sys/kern/sysv_shm.c | 2 +- sys/sys/syscallsubr.h | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 0291c2647da6..d8be29779386 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1042,8 +1042,7 @@ osigaction(struct thread *td, struct osigaction_args *uap) int osigreturn(struct thread *td, struct osigreturn_args *uap) { - - return (nosys(td, (struct nosys_args *)uap)); + return (kern_nosys(td, 0)); } #endif #endif /* COMPAT_43 */ @@ -4298,6 +4297,12 @@ struct nosys_args { /* ARGSUSED */ int nosys(struct thread *td, struct nosys_args *args) +{ + return (kern_nosys(td, args->dummy)); +} + +int +kern_nosys(struct thread *td, int dummy) { struct proc *p; diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index f923211cb6c8..e330f8a2ba09 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -51,14 +52,14 @@ int lkmnosys(struct thread *td, struct nosys_args *args) { - return (nosys(td, args)); + return (kern_nosys(td, 0)); } int lkmressys(struct thread *td, struct nosys_args *args) { - return (nosys(td, args)); + return (kern_nosys(td, 0)); } struct sysent nosys_sysent = { diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 1e84d151b4af..354a01fa7e3f 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1724,7 +1724,7 @@ freebsd32_msgsys(struct thread *td, struct freebsd32_msgsys_args *uap) return (sys_msgsys(td, (struct msgsys_args *)uap)); } #else - return (nosys(td, NULL)); + return (kern_nosys(td, 0)); #endif } diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index ad4243464a96..076851235ffa 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1904,7 +1904,7 @@ freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap) return (sys_semsys(td, (struct semsys_args *)uap)); } #else - return (nosys(td, NULL)); + return (kern_nosys(td, 0)); #endif } diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 60e3fe92a4b7..8d1a469127c6 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1474,7 +1474,7 @@ freebsd32_shmsys(struct thread *td, struct freebsd32_shmsys_args *uap) return (EINVAL); } #else - return (nosys(td, NULL)); + return (kern_nosys(td, 0)); #endif } diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 4450a28dc4dd..8fafb8ace311 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -249,6 +249,7 @@ int kern_munlock(struct thread *td, uintptr_t addr, size_t size); int kern_munmap(struct thread *td, uintptr_t addr, size_t size); int kern_nanosleep(struct thread *td, struct timespec *rqt, struct timespec *rmt); +int kern_nosys(struct thread *td, int dummy); int kern_ntp_adjtime(struct thread *td, struct timex *ntv, int *retvalp); int kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap, long *ploff);