From nobody Tue Nov 10 12:33:01 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 4jP5f54LCkz6yMCx for ; Tue, 10 Nov 2026 12:33:01 +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 4jP5f52fybz4sbj for ; Tue, 10 Nov 2026 12:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794313981; 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=vh5ZDOj0DVYajVhtjd266CPwiUZw8JjlU05MHyNAfTo=; b=Z175oNi7gn9J7SLKid60QMCsQJjCgyfChMgZ00UAPv+tLFBmoiiEl+Ep6SLKLyVRa9YosJ viQP5aqBkbYiAB/oBNzZREUIFYOrEO8LvGKWqyOrW9+W3gXloAFrzAZnEPsNrfBuCCKebz 3olhg5AH7+4KvwAq1UhH9cEqq3nKzMWXqi8bOCX+2EY+bex0JrqpJtnW7lG0CoGrFjDUYG GBrW24TzsZ8C09Ggcjri0m61ZFbgyUHOkD3nor/lUfMV28zqjQ6grz5OrQfxdNNF1aRIMO e4KPblBAIB2Ax9zXX7DbRPLNrmOk/enX6tAuu004eSvjH+oGkfPqIYSWs7RM6w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794313981; b=XJxtAECWBKb63AW1xYWl6Mroee4M/WhrpySmPg3dSymXIM0I8koQcB1VUuobsA2FuSZ+IH OVP8fJwPuJQSiOQN9CIo1er/cuC0Bd9Hsi2YwOqFc7ngjvo6+NBpmc9x4Ql/+WWbxmsCgi t3gyG/dQmJN7/a5UKVwxByDzYEBkclA9PbfO0sJGwj8LfXrrvNtMw4OCM+AcmHuFbYMY5D tywFPZ8DJFFMjEai1AlQhWI2yncT04NvADIP/dDPr/28G0QPzhy84xwqJvzffj/nFXlM4M S1zvbjvxGCWR/0g1HOtX8cxM7TlwatrRvRGl+wgHIYzJWdiq5ZV5z2hRb0dV+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794313981; 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=vh5ZDOj0DVYajVhtjd266CPwiUZw8JjlU05MHyNAfTo=; b=j312Imka4ub6c2fY9VhfL/KgPhl6D555HM28QEudKe0AWOEjYbadNCrH8Pw+Euq/uCUrCF 0EhlHhDD7xPsHIJIlY38ILRCd5/mNflX6hDzEABDearBLEAKgX8/oUZ4fHviz668k37WID nbzCkxv/b8Y58FV+NYhHo53162A351aG2hfL5cT+8YlLB936EUnjtQcYd3WqJdDaHavZpz YJecmhuFce2O8IND+8VNjgz0tISIRBUUKwUBuaXqP9A3OFwJVu30yERoACXwjWU+EFLFO/ hh1sEpK6vPXGrZZ20PP9DaQzYHVpqdOQcMkHxi3li9t0CQY/6SZDQ7n5t/hweg== 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 4jP5f52JsqzS3b for ; Tue, 10 Nov 2026 12:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 14679 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 12:33:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b96dc2c04fb4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: b96dc2c04fb4f504ad0c752c5d4b074c5bfbf7e0 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 12:33:01 +0000 Message-Id: <6af30efd.14679.6b2e223c@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b96dc2c04fb4f504ad0c752c5d4b074c5bfbf7e0 commit b96dc2c04fb4f504ad0c752c5d4b074c5bfbf7e0 Author: Brooks Davis AuthorDate: 2026-11-10 11:49:20 +0000 Commit: Brooks Davis CommitDate: 2026-11-10 11:49:20 +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 --- 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 6298f06fdba7..de2df96bdbf8 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -31,8 +31,9 @@ #include #include #include -#include +#include #include +#include #include #include #include @@ -373,18 +374,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); @@ -394,7 +400,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. @@ -405,12 +410,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. */ @@ -445,12 +454,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 bc00c4c7ee41..d8252c3becbd 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -52,6 +52,7 @@ struct kexec_segment; struct kld_file_stat; struct ksiginfo; struct mbuf; +struct module_stat; struct mq_attr; struct msghdr; struct msqid_ds; @@ -332,6 +333,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 *);