From nobody Mon Nov 16 10:45:53 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 4jSkzj52sCz7032Z for ; Mon, 16 Nov 2026 10:45:53 +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 4jSkzj3WGBz4lBl for ; Mon, 16 Nov 2026 10:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794825953; 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=2qvVubMHisvBm8JZQ7nTY6FVac7KdG0kDNtyD8D+9Ag=; b=Lu4zlM2gdh0u81Jk4V1nZiqeR1d2FszabAcFe5ZveOPJTGCfqZID0p5MCyYCZb6j7d9Piz TJa7Sc5GU7nWQ92eFsxTFUa6OwpYx3qerW4ZNHqm/sZ/VcgQAHxHiNq0e/eJLJ/xmmikTk 3fkvQ27rbo0EVnTH8dAixH8FMiQJIB7JVTQi3gkv+8MRNsRXMbZ8CbfPLGbCPKvKVGN00l MhIMGFaofCfD4/+vc723/ija/AlKFLhVn2dJQkQjIAjBWKxLF24CyuaTEuyFuFPEnK8qIi HNyLCvuYHt1fsTo1cDQqygPcpqklHBNJn6HpRDpHrA3QiE7D4keNwbvkjStzDQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794825953; b=t42lxVh1lUvRqWnIiR4Hf1dlqcgyKOSaO3IDwLgBPkFIIvbcPRsJf2YBZ78LurP6kNjJPE f95qrFPOendI9BG+RItSZx2msSQ/BDVegWy6u92lv++GNnPBK53lwBgT8mcwh874heLECd JxOERh5wII0/HALLdr0oj2ZQvCmhIl/7hALGxaQsjyz3wtq3A2A20yXkglQvUSJkWaGVcR icuqKfCFGdGbNK8CKs19SLJrWPQGWkp9Khh7C23Jnu7YFYvWFdrFNGuRtedVOfZUINsksI Z6sSwi5QB4Di70kY26LrgjEZyGU+siN5zWXZUU3RcDX/nNBNbkY6AhdFYzhHlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794825953; 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=2qvVubMHisvBm8JZQ7nTY6FVac7KdG0kDNtyD8D+9Ag=; b=Am1vkT0SFJXSMGVNbhI+XLlAt+/CCErjkdfwlAHNab5ILIxPkm4gjro/zQFJVufM3RkK1H ZyygOR05zQaAk1vWASXO5WiT6ErkCjCo6T440LeQglAegkM9u6qv7rv6363pXuijyxsJrR fRseYBV6vE1/kFySiv+oW5bAyTMUPwkc/k7cobc6t5h/PFQshC4Pe5oKXVTeeHEjhsCUjL AS6pdBq0IE8I2WXeDEc2QOoItEcFsIzARk7wbqqc8tmMetfZjeCdlkWDU93jNf6SuxoT0A W9mH0buAG+GOBmxkAD01dfCmAgG7SeYXxsSR8wwAGL1ZrdUQX28Jwh2Rmng2pw== 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 4jSkzj39pxzr9G for ; Mon, 16 Nov 2026 10:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fa3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 10:45:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 044b90b0f78f - stable/15 - modstat: don't copyout while holding a lock 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/15 X-Git-Reftype: branch X-Git-Commit: 044b90b0f78f1588668a27f6a83470b4e0787ad0 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 10:45:53 +0000 Message-Id: <6afadee1.fa3a.dd580aa@gitrepo.freebsd.org> The branch stable/15 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=044b90b0f78f1588668a27f6a83470b4e0787ad0 commit 044b90b0f78f1588668a27f6a83470b4e0787ad0 Author: Brooks Davis AuthorDate: 2026-11-12 10:23:24 +0000 Commit: Brooks Davis CommitDate: 2026-11-16 10:45:16 +0000 modstat: don't copyout while holding a lock If a user arranges for a page fault to never be filled (e.g., via a FUSE file system), this can hold the shared lock forever. To make this all work, refactor kern_modstat and freebsd32_modstat to malloc a temporary buffer and fill it before copying it out rather than doing a bunch of copies. Add COMPAT_* ifdefs around compat code. The module_stat_v1 code is really for a.out binaries in practice and thus a bit questionable. Reviewed by: markj Reported by: llm-postcr Sponsored by: Innovate UK Fixes: 7f8c2056db1e ("modstat: avoid copying from freed memory") Differential Revision: https://reviews.freebsd.org/D61432 (cherry picked from commit 1ebf46ecb6278e31d7ae029b0f8af3d64e7bc1f9) --- sys/kern/kern_module.c | 259 +++++++++++++++++++++++++++++-------------------- 1 file changed, 152 insertions(+), 107 deletions(-) diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 44afd6f1a0a4..d04bc8f61dbe 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -357,6 +357,7 @@ sys_modfnext(struct thread *td, struct modfnext_args *uap) return (error); } +#ifdef COMPAT_43 /* XXX - COMPAT_FREEBSD2 */ struct module_stat_v1 { int version; /* set to sizeof(struct module_stat) */ char name[MAXMODNAMEV1V2]; @@ -364,6 +365,18 @@ struct module_stat_v1 { int id; }; +static void +module2module_stat_v1(module_t mod, struct module_stat_v1 *stat) +{ + stat->version = sizeof(*stat); + /* Not necessarily NUL-terminated */ + strncpy(stat->name, mod->name, sizeof(stat->name)); + stat->refs = mod->refs; + stat->id = mod->id; +} +#endif + +#ifdef COMPAT_FREEBSD13 struct module_stat_v2 { int version; /* set to sizeof(struct module_stat) */ char name[MAXMODNAMEV1V2]; @@ -372,6 +385,29 @@ struct module_stat_v2 { modspecific_t data; }; +static void +module2module_stat_v2(module_t mod, struct module_stat_v2 *stat) +{ + stat->version = sizeof(*stat); + /* Not necessarily NUL-terminated */ + strncpy(stat->name, mod->name, sizeof(stat->name)); + stat->refs = mod->refs; + stat->id = mod->id; + stat->data = mod->data; +} +#endif + +static void +module2module_stat(module_t mod, struct module_stat *stat) +{ + stat->version = sizeof(*stat); + /* Not necessarily NUL-terminated */ + strncpy(stat->name, mod->name, sizeof(stat->name)); + stat->refs = mod->refs; + stat->id = mod->id; + stat->data = mod->data; +} + int sys_modstat(struct thread *td, struct modstat_args *uap) { @@ -382,76 +418,68 @@ 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_v2 *stat_v2; - char *name, *user_namep; - bool is_v1v2; + int version; + void *statbuf; + /* Look up first to preserve historic error priority */ MOD_SLOCK; mod = module_lookupbyid(modid); - if (mod == NULL) { - error = ENOENT; - goto out; - } - id = mod->id; - refs = mod->refs; - name = mod->name; - data = mod->data; + MOD_SUNLOCK; + if (mod == NULL) + return (ENOENT); /* * Check the version of the user's structure. */ if ((error = copyin(&stat->version, &version, sizeof(version))) != 0) - goto out; - is_v1v2 = (version == sizeof(struct module_stat_v1) || - version == sizeof(struct module_stat_v2)); - if (!is_v1v2 && version != sizeof(struct module_stat)) { - error = EINVAL; - goto out; + return (error); + + switch (version) { + case sizeof(struct module_stat): +#ifdef COMPAT_FREEBSD13 + case sizeof(struct module_stat_v2): +#endif +#ifdef COMPAT_43 /* XXX - COMPAT_FREEBSD2 */ + case sizeof(struct module_stat_v1): +#endif + statbuf = malloc(version, M_TEMP, M_WAITOK | M_ZERO); + break; + default: + 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, user_namep, namelen)) != 0) - goto out; - /* Extending MAXMODNAME gives an offset change for v3. */ - if (is_v1v2) { - stat_v2 = (struct module_stat_v2 *)stat; - if ((error = copyout(&refs, &stat_v2->refs, sizeof(int))) != 0) - goto out; - if ((error = copyout(&id, &stat_v2->id, sizeof(int))) != 0) - goto out; - } else { - if ((error = copyout(&refs, &stat->refs, sizeof(int))) != 0) - goto out; - if ((error = copyout(&id, &stat->id, sizeof(int))) != 0) - goto out; + MOD_SLOCK; + mod = module_lookupbyid(modid); + if (mod == NULL) { + MOD_SUNLOCK; + error = ENOENT; + goto out; } - /* - * >v1 stat includes module data. - */ - if (version == sizeof(struct module_stat_v2)) { - if ((error = copyout(&data, &stat_v2->data, - sizeof(data))) != 0) - goto out; - } else if (version == sizeof(struct module_stat)) { - if ((error = copyout(&data, &stat->data, - sizeof(data))) != 0) - goto out; + switch (version) { + case sizeof(struct module_stat): + module2module_stat(mod, statbuf); + break; +#ifdef COMPAT_FREEBSD13 + case sizeof(struct module_stat_v2): + module2module_stat_v2(mod, statbuf); + break; +#endif +#ifdef COMPAT_43 /* XXX - COMPAT_FREEBSD2 */ + case sizeof(struct module_stat_v1): + module2module_stat_v1(mod, statbuf); + break; +#endif } + MOD_SUNLOCK; + + if ((error = copyout(statbuf, stat, version)) != 0) + goto out; + td->td_retval[0] = 0; out: - MOD_SUNLOCK; + free(statbuf, M_TEMP); return (error); } @@ -497,6 +525,7 @@ typedef union modspecific32 { uint32_t ulongval; } modspecific32_t; +#ifdef COMPAT_FREEBSD13 struct module_stat32_v2 { int version; char name[MAXMODNAMEV1V2]; @@ -505,6 +534,18 @@ struct module_stat32_v2 { modspecific32_t data; }; +static void +module2module_stat32_v2(module_t mod, struct module_stat32_v2 *stat) +{ + stat->version = sizeof(*stat); + /* Not necessarily NUL-terminated */ + strncpy(stat->name, mod->name, sizeof(stat->name)); + stat->refs = mod->refs; + stat->id = mod->id; + stat->data.uintval = mod->data.uintval; +} +#endif + struct module_stat32 { int version; char name[MAXMODNAME]; @@ -513,78 +554,82 @@ struct module_stat32 { modspecific32_t data; }; +static void +module2module_stat32(module_t mod, struct module_stat32 *stat) +{ + stat->version = sizeof(*stat); + /* Not necessarily NUL-terminated */ + strncpy(stat->name, mod->name, sizeof(stat->name)); + stat->refs = mod->refs; + stat->id = mod->id; + stat->data.uintval = mod->data.uintval; +} + int freebsd32_modstat(struct thread *td, struct freebsd32_modstat_args *uap) { module_t mod; - modspecific32_t data32; int error = 0; - int id, namelen, refs, version; + int version; + void *statbuf; struct module_stat32 *stat32; - struct module_stat32_v2 *stat32_v2; - char *name; - bool is_v1v2; + /* Look up first to preserve historic error priority */ MOD_SLOCK; mod = module_lookupbyid(uap->modid); - if (mod == NULL) { - error = ENOENT; - goto out; - } + MOD_SUNLOCK; + if (mod == NULL) + return (ENOENT); - id = mod->id; - refs = mod->refs; - name = mod->name; - _Static_assert(sizeof(data32) == sizeof(data32.uintval), - "bad modspecific32_t size"); - CP(mod->data, data32, uintval); stat32 = uap->stat; - if ((error = copyin(&stat32->version, &version, sizeof(version))) != 0) - goto out; - is_v1v2 = (version == sizeof(struct module_stat_v1) || - version == sizeof(struct module_stat32_v2)); - if (!is_v1v2 && version != sizeof(struct module_stat32)) { - error = EINVAL; - goto out; + return (error); + + switch (version) { + case sizeof(struct module_stat32): +#ifdef COMPAT_FREEBSD13 + case sizeof(struct module_stat32_v2): +#endif +#ifdef COMPAT_43 /* XXX - COMPAT_FREEBSD2 */ + case sizeof(struct module_stat_v1): +#endif + statbuf = malloc(version, M_TEMP, M_WAITOK | M_ZERO); + break; + default: + return (EINVAL); } - namelen = strlen(mod->name) + 1; - if (is_v1v2 && namelen > MAXMODNAMEV1V2) - namelen = MAXMODNAMEV1V2; - else if (namelen > MAXMODNAMEV3) - namelen = MAXMODNAMEV3; - if ((error = copyout(name, &stat32->name[0], namelen)) != 0) - goto out; - /* Extending MAXMODNAME gives an offset change for v3. */ - if (is_v1v2) { - stat32_v2 = (struct module_stat32_v2 *)stat32; - if ((error = copyout(&refs, &stat32_v2->refs, sizeof(int))) != 0) - goto out; - if ((error = copyout(&id, &stat32_v2->id, sizeof(int))) != 0) - goto out; - } else { - if ((error = copyout(&refs, &stat32->refs, sizeof(int))) != 0) - goto out; - if ((error = copyout(&id, &stat32->id, sizeof(int))) != 0) - goto out; + MOD_SLOCK; + mod = module_lookupbyid(uap->modid); + if (mod == NULL) { + MOD_SUNLOCK; + error = ENOENT; + goto out; } - /* - * >v1 stat includes module data. - */ - if (version == sizeof(struct module_stat32_v2)) { - if ((error = copyout(&data32, &stat32_v2->data, - sizeof(data32))) != 0) - goto out; - } else if (version == sizeof(struct module_stat32)) { - if ((error = copyout(&data32, &stat32->data, - sizeof(data32))) != 0) - goto out; + switch (version) { + case sizeof(struct module_stat32): + module2module_stat32(mod, statbuf); + break; +#ifdef COMPAT_FREEBSD13 + case sizeof(struct module_stat32_v2): + module2module_stat32_v2(mod, statbuf); + break; +#endif +#ifdef COMPAT_43 /* XXX - COMPAT_FREEBSD2 */ + case sizeof(struct module_stat_v1): + module2module_stat_v1(mod, statbuf); + break; +#endif } + MOD_SUNLOCK; + + if ((error = copyout(statbuf, stat32, version)) != 0) + goto out; + td->td_retval[0] = 0; out: - MOD_SUNLOCK; + free(statbuf, M_TEMP); return (error); } #endif