From nobody Mon Nov 16 18:12:49 2026 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 4jSwvR2x2Fz70VQF for ; Mon, 16 Nov 2026 18:12:51 +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 4jSwvP6hvcz4HST for ; Mon, 16 Nov 2026 18:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794852769; 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=1SuHWsIEeucrAehcpn+atAwc7yspZcX8g9nT6gvhg7k=; b=LFqooLB64tbouX0ct1BtQZhvlU+pXNJXTLAPkdcu35YvROUbgJ+WtHuOixNS/BCLoUXhvM mXIlH8Eg1wy//uJmxRJesxLMv5TSkvgRlu189NtDJ8y7YlIpOggDL2GBmJL4Ltj35vRgkB 12Gs4ACfhvrqSuu1RSHoSHm2ro2clefT9q2JnAKc3C7MleliifJuV3w8LJVS4wNkSupi8M ycxn1o7l2n5CaWfT7gYUEg716ZlbMi9n3/1AYI5qgLzT5aY4seVGBRySsYDGCKelxGrrPz ohRjP85N3Kjq84LAQTA2ncL6jWEflGMSFBk5QyYA8b8P1bSsi3e4EzHBsDSQzA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794852769; b=sFlUMnSxWD+rrOJvSAg8anOM14eICy1rwfkbwdY2Hw0CIdP55/PzDnOOkz2bwssPy4SdG3 sWuuRreEyWHRYEk6p9rlNhqWyf7TqJpq3n+a3pwgjNS7yPkE7VDbYFfNsFgA0vhlhK984N nw8ZEV91dUr1iN1aAHRqRxyyqx8s1pknRDGx2mKsdJOtFOr9s4i2JvADIEd2/ABrQNvTvA FXPNncvCPuimupsQVVbIbwGOKQs+oUR05Q4qjE7xxy5q0wcJX+okv28I0n8iPhwPrqOY6R vDoxZUYuoHkBVWEPrsP7tGIiTCxWiR8tTc42+IvT17dgYWjRZV08xQ+5OSR5jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794852769; 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=1SuHWsIEeucrAehcpn+atAwc7yspZcX8g9nT6gvhg7k=; b=UL/wk3eZcNLr11EOpDvgs8Z1VQRgSHLQFoTqQU9efn1ELoQyRX3PeBrg6dhEFnMG44R2Uk /RYsPRt1YePercH+KGaBTxyf/4gAseEDkD36fnh9VN41z4ok1J5wdRBiQVQ0Guh1PQlHZo PeguvOsl/qmWLQKDQAUSR9XKIUx77evpRCTNM0DhTEpXPGba4p8fnRDPwH2MTWS3m3cQhJ +ZUjMs1ZJtW/7V6yHALRXVMTfHuS9JZNqLozzQNdAx59MJSXA4+cz3Ab77qLUwMjz6/lsf kBU31wbErABRwZPmr7dIZPqYohPZ6AcHkRjnAMsOnvPftY+2m38VoXfeK4G+oQ== 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 4jSwvP651Kz15Kw for ; Mon, 16 Nov 2026 18:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 16f88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 18:12:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: ec213d186be9 - stable/14 - kern_module.c: add kern_ implementations List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ec213d186be9c954ce786c76d4623941ac142ee1 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 18:12:49 +0000 Message-Id: <6afb47a1.16f88.74a93bba@gitrepo.freebsd.org> The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ec213d186be9c954ce786c76d4623941ac142ee1 commit ec213d186be9c954ce786c76d4623941ac142ee1 Author: Brooks Davis AuthorDate: 2026-11-10 11:49:20 +0000 Commit: Brooks Davis CommitDate: 2026-11-16 15:57:41 +0000 kern_module.c: add kern_ implementations In the case of modstat(2) use a cast to access the name member of the old struct version so the compiler see the right array size. This addresses a sub-object bounds bug. Effort: CHERI upstreaming Sponsored by: DARPA, AFRL, Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 (cherry picked from commit b96dc2c04fb4f504ad0c752c5d4b074c5bfbf7e0) --- sys/kern/kern_module.c | 29 ++++++++++++++++++++++------- sys/sys/syscallsubr.h | 3 +++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 5568ff57a860..aba5cc02dc50 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -32,8 +32,9 @@ #include #include #include -#include +#include #include +#include #include #include #include @@ -374,18 +375,23 @@ struct module_stat_v2 { int sys_modstat(struct thread *td, struct modstat_args *uap) +{ + return (kern_modstat(td, uap->modid, uap->stat)); +} + +int +kern_modstat(struct thread *td, int modid, struct module_stat *stat) { module_t mod; modspecific_t data; int error = 0; int id, namelen, refs, version; - struct module_stat *stat; struct module_stat_v2 *stat_v2; - char *name; + char *name, *user_namep; bool is_v1v2; MOD_SLOCK; - mod = module_lookupbyid(uap->modid); + mod = module_lookupbyid(modid); if (mod == NULL) { MOD_SUNLOCK; return (ENOENT); @@ -395,7 +401,6 @@ sys_modstat(struct thread *td, struct modstat_args *uap) name = mod->name; data = mod->data; MOD_SUNLOCK; - stat = uap->stat; /* * Check the version of the user's structure. @@ -406,12 +411,16 @@ sys_modstat(struct thread *td, struct modstat_args *uap) version == sizeof(struct module_stat_v2)); if (!is_v1v2 && version != sizeof(struct module_stat)) return (EINVAL); + if (is_v1v2) + user_namep = ((struct module_stat_v1 *)stat)->name; + else + user_namep = stat->name; namelen = strlen(mod->name) + 1; if (is_v1v2 && namelen > MAXMODNAMEV1V2) namelen = MAXMODNAMEV1V2; else if (namelen > MAXMODNAMEV3) namelen = MAXMODNAMEV3; - if ((error = copyout(name, &stat->name[0], namelen)) != 0) + if ((error = copyout(name, user_namep, namelen)) != 0) return (error); /* Extending MAXMODNAME gives an offset change for v3. */ @@ -446,12 +455,18 @@ sys_modstat(struct thread *td, struct modstat_args *uap) int sys_modfind(struct thread *td, struct modfind_args *uap) +{ + return (kern_modfind(td, uap->name)); +} + +int +kern_modfind(struct thread *td, const char *uname) { int error = 0; char name[MAXMODNAMEV3]; module_t mod; - if ((error = copyinstr(uap->name, name, sizeof name, 0)) != 0) + if ((error = copyinstr(uname, name, sizeof name, 0)) != 0) return (error); MOD_SLOCK; diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index ab56b22978c2..e88bbcc995f9 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -50,6 +50,7 @@ struct kevent_copyops; struct kld_file_stat; struct ksiginfo; struct mbuf; +struct module_stat; struct msghdr; struct msqid_ds; struct pollfd; @@ -239,6 +240,8 @@ int kern_mmap(struct thread *td, const struct mmap_req *mrp); int kern_mmap_racct_check(struct thread *td, struct vm_map *map, vm_size_t size); int kern_mmap_maxprot(struct proc *p, int prot); +int kern_modfind(struct thread *td, const char *uname); +int kern_modstat(struct thread *td, int modid, struct module_stat *stat); int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, int prot, int flags); int kern_msgctl(struct thread *, int, int, struct msqid_ds *);