From nobody Wed Nov 11 09:58:12 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 4jPf913l0Zz6yy1r for ; Wed, 11 Nov 2026 09:58:13 +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 4jPf9109PMz4l1J for ; Wed, 11 Nov 2026 09:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794391093; 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=FtkJeP9AabVc/s6KAZ/mJRT1FXrYvv3v0EtZDoma9YY=; b=aUu/r583JPfagJ4aAH+qP2xCpAcakhq9TJOLK4VuiBU5DNBUap5a9tz+aSHz1sQT7flarK +gRFIqKZ9uF4yoWnVB0MUImL5xjPVmGIvjkCQzJqCAK85tfMv5YBtrCTFwxx5FOIs+Sr5R IjPZav1lp7ydTidF5ezT1OpGQ2iMXozzzZA0m8T67K7udkJc06EUwKhUSd0XqE+9f8t8sC Pm6FvGJyjPEsZNC7Ycjf5TxPxuJ8x7nfCGYhSt1cHb8Lbu5MT6DEXHtYEibXe+Wb27cVgu btioCFYvoAi+UVbtkujfYBef4IWSCCsdO3iqgwDgQRfDuMiNy0UE5CUEXjd9ZA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794391093; b=ZNNiMw+MwPWfZq+B/+oqas4+QF8lIBcNeZFmM8ILOM1dMSW5Dm8jrh//+A6G3qazl+BAps jJ5n6JbM97mFKRF02wrrfpg+LeXSWhpNQRnb+jfrh8Yz3bBodbilT4jHA5HEOBDesG6cSI v8s94eeeaD5vibCsloOpzfHyw45Tkwvt2yYLV91DOreXC+k+w8epzY+o6ol0ODQsddx5gy v+jBAsPhXElH7xORzYGxRdKJwKP6uZ8kj79ibj1AyqX/J+sQD669zkSc+YLYkZ+C7FKSLW sdcoKlFNT+SyuBAmApUwEF7ceDRx94p4S71PWCFnGgUy5CEJotFN2ngatF9dlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794391093; 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=FtkJeP9AabVc/s6KAZ/mJRT1FXrYvv3v0EtZDoma9YY=; b=JM9yPij0/I6hkSOHq8V35Xt5Ul1wS+nrB9wgAuqIvteWoQNPFwGQMrOX8/QW3amOQas51i BttYf8ABMoWFKnaHQ6NDiHLef/o3eM/DYV5d43qWvf5Nui8sZc62yD+aZZrBB95SfLEiLE yAlSE287B3X1zaIj9yvy6oTxNpPWwebZWPEy/98lfhWqr/5fnS88ZDyzeQDUgAO1o4wcrY OU3corAsJ2BirstcBt0BOYZivS9z2uhPYTcfB7d6vKWI1k+oWdwkC6PEuSx+IQbZCjiOuv YaJHclJbjZQRN1Y8WvzvuuTsvdxYeiU7ujfUGho/N0YWBaUOAycym9OGLxf3OA== 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 4jPf906F5qz18rv for ; Wed, 11 Nov 2026 09:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 10b36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 09:58:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7f8c2056db1e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7f8c2056db1e39e44c3eda15aa4e53f7fc971cd8 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 09:58:12 +0000 Message-Id: <6af43c34.10b36.62ec09f3@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7f8c2056db1e39e44c3eda15aa4e53f7fc971cd8 commit 7f8c2056db1e39e44c3eda15aa4e53f7fc971cd8 Author: Brooks Davis AuthorDate: 2026-11-11 09:40:40 +0000 Commit: Brooks Davis CommitDate: 2026-11-11 09:40:40 +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 --- 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