From nobody Sun Jul 6 21:14:36 2025 X-Original-To: dev-commits-src-main@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 4bb0W13dLdz61pgK; Sun, 06 Jul 2025 21:14:37 +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 4bb0W050qXz3fyP; Sun, 06 Jul 2025 21:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751836476; 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=2nyBtGA0SUzN+/VkDJTn9rFUCf/OXgGSnjvSO8+CqpM=; b=ylVaPI29K5vKUiFmAgkIXy6lG9F1jV23bx/3aEdgqTPxNSac39qHn/Pj6TporYdC60SHTM w229NoBxdd/VR2rly0JsRWKn7ZwkXbo+Q1/HhFbf8RC/uWBi4f6Y6StnPK1yrwE5fS3e7n ssFU8ZjK8qpL8HgQ8igaRzMXXNMOMZzMaBHkfprvPw+rfTXYn0GvkHAJATujC8fNCEQmd2 hAgS1x2eju+cRblEqPHNtZM6+plEdsChbPrIuocPE4r5OTz37XXaIRgCYMieTCwGKrEEOj l73nSbOrBhn8VtJ6swaVTi5oSiaHJOHL8I7AEAK2X3UkRCeVMdF6btZ4rfqTkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751836476; 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=2nyBtGA0SUzN+/VkDJTn9rFUCf/OXgGSnjvSO8+CqpM=; b=q7rPq3D0ad2i1sBka0tHhaa78WXbqFN/0tDkVQr/HwK+8TDXPBmc0bOgB2kVONp9//Z0x+ 8Y/lG6QF8Dcu3RY1Xig3aXuAjefvFWiluERF8Ve9vx00lsWGOnlZ38GWkC+J3vfb9xQgqq nqAlU1d2XID7QTYeMRMP/41yV1nEaZmkaoayCvXT2KILdHPgNRJ0IHQZCei8IyNNrgQ5Sy IJ8txcwa22b/7tI8/j/LCYetfS2gUJ0mUVeRvcgMlpj0maHzT81qbJ/nTeAResmn53N11G rR+VS6gdEfj23MWMOKBj9qLuBEci5WBWGF3nM7f3rAfepGzrY1OchtTIC0lAqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751836476; a=rsa-sha256; cv=none; b=f8EWmvtXakoUMasg6eUD7Tc9QzPo+cjMrT9pcy3Rr2pZsv81OFCAzylrQmHyB0c5YiVInK d4UJxKy0zmRPjoPdMqWXAQ2mnGYaQFadnptbkkIqR1DFZY/11lzv+whDr0tNUvowP1RYH2 SRwWdpojpxSZKzBaSrpI+QIVkGRbvLiP2pE8J2s0z9HDiYn3NpuVZkqdcmpa/e4ucxsdel IPe3LhEuJ3oYZQGJB04zzlmPEzjxjV4xEVsH8YazPZZ50GBOsKbrLMHUXd8ia0oKuIbTRt ordx/JoTXUat9jEFoaikfKF/OBWxLczU3npDWNUropUAzIB7i0NrbsBM14w8cg== 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 4bb0W0182Hz6Yl; Sun, 06 Jul 2025 21:14:36 +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 566LEa4o003151; Sun, 6 Jul 2025 21:14:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566LEarb003148; Sun, 6 Jul 2025 21:14:36 GMT (envelope-from git) Date: Sun, 6 Jul 2025 21:14:36 GMT Message-Id: <202507062114.566LEarb003148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 26061e4e542d - main - kern: add kern_nosys() and use it instead of type-punning the sys_nosys() arg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 26061e4e542d220c577fb3437a9a9f108dc27698 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=26061e4e542d220c577fb3437a9a9f108dc27698 commit 26061e4e542d220c577fb3437a9a9f108dc27698 Author: Konstantin Belousov AuthorDate: 2025-07-06 12:18:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-06 21:14:14 +0000 kern: add kern_nosys() and use it instead of type-punning the sys_nosys() arg Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 a61ebfc5c7c8..5d51aa675cb7 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1050,8 +1050,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 */ @@ -4287,6 +4286,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 24406763a93a..a93d711e7597 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -50,14 +51,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 11141d197aec..a545a0a54c25 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 e399517010fc..a99e1a4de14e 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 fe6dd9e14fb4..fd183ffbc7a4 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -257,6 +257,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);