From nobody Tue Nov 17 19:51:56 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 4jTb3K1rGpz71lM3 for ; Tue, 17 Nov 2026 19:51:57 +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 4jTb3J5WsBz3Gfc for ; Tue, 17 Nov 2026 19:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UloRB/3DrnWSDePns+Nl7Mu46zVkfxuVeHhkdpF8dTg=; b=ZhjDW8ppGhlrLKNMgHhq4RaI6QjpcAI6bFOrgL84Q4V8Qv9m/SkPI+VnngFDnhWIv2gmkm tHdJS2iKgNl9JqHGV2KuRXGG5BFBuOyUWfPZqaRTETLrsxpf6OVn5fvX8JJuu4UAnpJnOo UIqAuKI65maqhFQu3jQ3haQnosioeskMuCOfmlPvk7zmZWKzHmJTU6bI4YdzD/nwlzvt26 mJSeVph0M1Ak0ENbfnK34f3Gi5JLbkmqSasa71cGAzYK9B3Jswbq7XG2gq0jZ2wXQWGqhF ZqUcm2oU6I7ykR4kIrIQ7nK1w64OruCO5otVPinEXXxJgp9XRuHZJleS3lYlIQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794945116; b=u6XuS9Vt/5AUBRxGUQsSgrzN/sfEuXlyvbdUvgti2dnBZgycr32QTOL7mMwMfphdUpFMpE yHeUPKfMRHfwLlOndlMcKIDSQv5DMrLcSOSZAjR1/D7k84Lr6jQbMrJnHHr3JDc7Pj4kFU FyS86Fw5+LUI4CrHPLBhxap25SNjmn1gM7VaDmHhMCljhWASThnJsdAcJ3dG020JFxUHrO k1wBT0yTEJqOhc+axBPHLbvhYc0kOuJy3MfnKXeYNqykEf8tjQHv8yhKHmrpH5T8SWi/UJ et6gGKFzNTnIIHznAMLvUCDw8g9o0gCPQEpMkKKchg5eYB50TPcVw8ofcxsuOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UloRB/3DrnWSDePns+Nl7Mu46zVkfxuVeHhkdpF8dTg=; b=FCFonMD77NTXmwzmoEnarIClMr/LrVc3KY+C8ZY2BGKZlEW/aUR4F6i6pmjBB5BvCBkorU NjAz1P55issp1Ud1oP6Jp8h+xMhkKwQz00Dd1ZHvBOFSyK4paFrEtU/+ykBuATwxfWT9ca qsrbuuPvMR0ZbguD6TKf1C5PMASvPf0TgbKCLDkZyJ/0X4/b7bjcVjqofcK7zTy12Z4Pp0 742JgT9f4lphhfZxdpf2VVCVFmXnbKg4MzFiHglsI2SAnefYUXRnVvYVgRO4TehU+2H7tw +Cg25ZbDFUntb2mT1JPLRAbbJ2iZcwuaWA3q9LgGWEWENpIZ1yA76AfaEPLC0Q== 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 4jTb3J4ldGzxGM for ; Tue, 17 Nov 2026 19:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 11e17 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 19:51:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brooks Davis From: Colin Percival Subject: git: 0ca24389d3a9 - releng/15.2 - modstat: avoid copying from freed memory 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 0ca24389d3a98df85cfcf995377963842e8f041e Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 19:51:56 +0000 Message-Id: <6afcb05c.11e17.1df47b6b@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ca24389d3a98df85cfcf995377963842e8f041e commit 0ca24389d3a98df85cfcf995377963842e8f041e Author: Brooks Davis AuthorDate: 2026-11-11 09:40:40 +0000 Commit: Colin Percival CommitDate: 2026-11-17 19:51:15 +0000 modstat: avoid copying from freed memory If a module is unloaded after the module is looked up in kern_modstat, but before one of the copyout's occurs, then the memory being copied might be freed and reused leading to an information disclosure. The LLM was particularly concerned about a TOCTOU issue in the length of the name, but it seems likely that there are issues with all the copyout's. As such, hold the shared lock throughout. Approved by: re (cperciva) Reviewed by: markj Reported by: llm-postcr MFC after: 3 days Sponsored by: Innovate UK Fixes: 9b3851e9e3b1 ("- Lock down the ``module'' structure...") Differential Revision: https://reviews.freebsd.org/D61398 (cherry picked from commit 7f8c2056db1e39e44c3eda15aa4e53f7fc971cd8) (cherry picked from commit 80fed5b6b5bdf712603b90a236796e35ed7e604c) --- sys/kern/kern_module.c | 58 ++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index de2df96bdbf8..44afd6f1a0a4 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -392,24 +392,25 @@ kern_modstat(struct thread *td, int modid, struct module_stat *stat) MOD_SLOCK; mod = module_lookupbyid(modid); if (mod == NULL) { - MOD_SUNLOCK; - return (ENOENT); + error = ENOENT; + goto out; } id = mod->id; refs = mod->refs; name = mod->name; data = mod->data; - MOD_SUNLOCK; /* * Check the version of the user's structure. */ if ((error = copyin(&stat->version, &version, sizeof(version))) != 0) - return (error); + goto out; is_v1v2 = (version == sizeof(struct module_stat_v1) || version == sizeof(struct module_stat_v2)); - if (!is_v1v2 && version != sizeof(struct module_stat)) - return (EINVAL); + if (!is_v1v2 && version != sizeof(struct module_stat)) { + error = EINVAL; + goto out; + } if (is_v1v2) user_namep = ((struct module_stat_v1 *)stat)->name; else @@ -420,20 +421,20 @@ kern_modstat(struct thread *td, int modid, struct module_stat *stat) else if (namelen > MAXMODNAMEV3) namelen = MAXMODNAMEV3; if ((error = copyout(name, user_namep, namelen)) != 0) - return (error); + 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) - return (error); + goto out; if ((error = copyout(&id, &stat_v2->id, sizeof(int))) != 0) - return (error); + goto out; } else { if ((error = copyout(&refs, &stat->refs, sizeof(int))) != 0) - return (error); + goto out; if ((error = copyout(&id, &stat->id, sizeof(int))) != 0) - return (error); + goto out; } /* @@ -442,13 +443,15 @@ kern_modstat(struct thread *td, int modid, struct module_stat *stat) if (version == sizeof(struct module_stat_v2)) { if ((error = copyout(&data, &stat_v2->data, sizeof(data))) != 0) - return (error); + goto out; } else if (version == sizeof(struct module_stat)) { if ((error = copyout(&data, &stat->data, sizeof(data))) != 0) - return (error); + goto out; } td->td_retval[0] = 0; +out: + MOD_SUNLOCK; return (error); } @@ -525,8 +528,8 @@ freebsd32_modstat(struct thread *td, struct freebsd32_modstat_args *uap) MOD_SLOCK; mod = module_lookupbyid(uap->modid); if (mod == NULL) { - MOD_SUNLOCK; - return (ENOENT); + error = ENOENT; + goto out; } id = mod->id; @@ -535,35 +538,36 @@ freebsd32_modstat(struct thread *td, struct freebsd32_modstat_args *uap) _Static_assert(sizeof(data32) == sizeof(data32.uintval), "bad modspecific32_t size"); CP(mod->data, data32, uintval); - MOD_SUNLOCK; stat32 = uap->stat; if ((error = copyin(&stat32->version, &version, sizeof(version))) != 0) - return (error); + goto out; is_v1v2 = (version == sizeof(struct module_stat_v1) || version == sizeof(struct module_stat32_v2)); - if (!is_v1v2 && version != sizeof(struct module_stat32)) - return (EINVAL); + if (!is_v1v2 && version != sizeof(struct module_stat32)) { + error = EINVAL; + goto out; + } 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) - return (error); + 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) - return (error); + goto out; if ((error = copyout(&id, &stat32_v2->id, sizeof(int))) != 0) - return (error); + goto out; } else { if ((error = copyout(&refs, &stat32->refs, sizeof(int))) != 0) - return (error); + goto out; if ((error = copyout(&id, &stat32->id, sizeof(int))) != 0) - return (error); + goto out; } /* @@ -572,13 +576,15 @@ freebsd32_modstat(struct thread *td, struct freebsd32_modstat_args *uap) if (version == sizeof(struct module_stat32_v2)) { if ((error = copyout(&data32, &stat32_v2->data, sizeof(data32))) != 0) - return (error); + goto out; } else if (version == sizeof(struct module_stat32)) { if ((error = copyout(&data32, &stat32->data, sizeof(data32))) != 0) - return (error); + goto out; } td->td_retval[0] = 0; +out: + MOD_SUNLOCK; return (error); } #endif