From nobody Mon Nov 16 18:12:50 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 4jSwvS28pxz70VMs for ; Mon, 16 Nov 2026 18:12:52 +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 4jSwvR0b2Cz4HmD for ; Mon, 16 Nov 2026 18:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794852771; 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=EX1ajnDyJSFPBQ0AkZys2OQitcagWxdk8criV6Q4GJM=; b=cEniYhuM46MsCahpsq2gYL7MKQ5tJIFB2DgCzIc5xjtNEvHDbVbWkIDnsOpvcYYCdzpahd PcZQSBvmMGHJkXrnB5GJhG9YCthr94Z11MY0XQdnSypX/tJqdXuK9g06srAAkIk4itPuwe xdZmsCa0Ic423IkHaN6/yeBBhr5cmWrWJmO8LHyRTa846LwOEJHkqBi/qLQ66GLB63znVg 1oeBP2QHilAAW5QPP+3HwjLEAI/71h+nE8bkF2FDyJwShr2MUPuBKeyYGEaC/Flxmuyshp D1vUA/IlsxTNAjfnSYYEa9WwXg2nvzBrmrEEnONj482YBc4OEg34m4Ei5t9j0w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794852771; b=KP+MizcU80eVldXuHiIuh1oRc5YnWN/RwVNE1dwPF2aZnwGNlaqCG30LOxd6McM3sUgBWp t7bcLIuf7LIN6zuhGW8tAFYrLx8NgHuo8lXX/qfxqWzlzKydsa5b+HWaIvk61lcdbtMGW1 c6DmMJAgBzaw0WmDFwGPn2JUPocWGte9LaOk5uAreCR6D8ecojJfokfGOcylWna1BRABOI ToHbmf5g99gGUGBqXxBiPbg5pW96SmW+L69Hi62N5EIae4ziyROYp30e1vZx7mOYM0yqZz 3Nw/dGeACjuczdPNgs4xh7onVY9g0VvYO3EBRoxwjpqtOmosT69HgQOUz06o8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794852771; 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=EX1ajnDyJSFPBQ0AkZys2OQitcagWxdk8criV6Q4GJM=; b=f6k7SvLGsXssZtdYuHUHWEjkvVCU09gcS2MPmIs3TuNvB/cJ4q8vTrKYhnJRyk4o5m8Qrr zLUTNWhtS/dmkK2l7m84YvKU0CiaPDUsQPAflQGki9QF6S4jwwQQlFyQ+jdgVQF6xhA5Zo RDxTT//PFSDc7uGugdzgepK6RmaFcPV1kdx4LCreqp5D8MR7rHDpQFfhVwmIFoBtMM/J2x qiEe77h36qD8mOYKaY4NReB7BkqnErP7RaDHU2pc32Q7+KoLbJNevyt1/uIl8Tj6tEDUi5 3OTVRTQJh6qN4wI1npndt3vXX2LcZpMQGOKIeVvuWRflsE4O/e/Cb9U+NMc13w== 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 4jSwvQ6MpMz15Ht for ; Mon, 16 Nov 2026 18:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 15d55 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 18:12:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 776493a19330 - stable/14 - 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 776493a19330ad80ef822facaae0b68fbcfc3320 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 18:12:50 +0000 Message-Id: <6afb47a2.15d55.304431c6@gitrepo.freebsd.org> The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=776493a19330ad80ef822facaae0b68fbcfc3320 commit 776493a19330ad80ef822facaae0b68fbcfc3320 Author: Brooks Davis AuthorDate: 2026-11-11 09:40:40 +0000 Commit: Brooks Davis CommitDate: 2026-11-16 15:57:42 +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. 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) --- 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 aba5cc02dc50..0f04deac16d4 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -393,24 +393,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 @@ -421,20 +422,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; } /* @@ -443,13 +444,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); } @@ -526,8 +529,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; @@ -536,35 +539,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; } /* @@ -573,13 +577,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