From nobody Mon Nov 16 17:37:24 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 4jSw6Y3Z9Rz718mp for ; Mon, 16 Nov 2026 17:37:25 +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 4jSw6Y0XGRz3K3W for ; Mon, 16 Nov 2026 17:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794850645; 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=izxbqQji+0od/XNZpIZ8ItBXXPZ90YZFSDxagYinFdk=; b=OEL+/RPH9lTPrl7Jo5NSA+8tYRCwyEDJ15vOefRateDOHfKi004SDPR8sTSJXhW03quxlZ +33wTxv95bnARnRF2N9jrWZHxfszy/a0QXCLOAhH9GB2eoEs6stc0b7jsMjCle+2HZXgKd ioTbZ8TGu1x0mHHGSJ1DOLVkJUail2y7lD5QXJSfHj6OXHYviTa+R8P7ADFguNZVS0isyX fYY0wDrrwg2hTn2mOpamyi2+U5LhHGbRap0Y0EAZ9fImXbX5ly2ipXSsuQVE1/73mY70FI hQNEHj3b+llB6bhAWxfxe9MtSfVZYxPuOIZ5hcoDobG1yu9Er3ps9ozCUKHAEg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794850645; b=Er01rzK/YGvqYI8ZD1UwZEupk4b6TgaDF4oHklg0YnTa4PgV+dP7OEfUignHQBwI6/MEwj Z7zq9lTB0RzIORQPVt2qPR/hpfCceicCOo8HbZ/pP7rS/SexLjjMgr5SDLK01N1TYaqRA5 JIqiPnqsFYweI06Kmd8aSFKH5k0srM/3eW6ur0d3kMPoC1UxI/GV/PF6AZaf5YZD1PCKTP v9C7pRXJs+r2F0lJq3atAv1hErXdPoRxLrJ7rLyvEbtUNOXLWJhTisW8F6NqKkcYRtqwgK lRiMVcLT01rqZLTF5MUXwMpW6KRlol4w4bight7pM1aF4iYeZ/KU9LZJBSABPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794850645; 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=izxbqQji+0od/XNZpIZ8ItBXXPZ90YZFSDxagYinFdk=; b=RYc7Ms/qCc3UiSzsabEryiKvJv5vJai111sIt/UJtWhdYtIjLHtK2iFhle1exlIDsqkMrN gJ15WcmQ1896MeOLIpMcV9w8iKMcxzwAJlllMtCL5/4T7qtNQyvuaSN5l5fd+GpyuVvX0S WMaBO2ictzQ9a+9DFo+6+yuX8t5wzmZRwGdrNsicCD+eb0zQm8q4t9xcsY6Lk3Gr/81gUU dFCQT/Qu4RmuuyHudupBCgL2ieKqFQUHM0d6qeza6HbXPQ9E3ePciBO9fKZAGoqgvQe0Kv AqbnYzXrPWxUMQMhNydnjGJ+ne3AhpywAC+EAaR6LYSevpzRe18KpPq1qqU5yg== 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 4jSw6X72Jzz14BM for ; Mon, 16 Nov 2026 17:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 124f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 17:37:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c27f0ee61fc4 - main - mac: Fix a couple of bugs in prison label handling 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c27f0ee61fc4d13c0eb18ab5d542b349c0eab5b4 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 17:37:24 +0000 Message-Id: <6afb3f54.124f0.5bcb81d8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c27f0ee61fc4d13c0eb18ab5d542b349c0eab5b4 commit c27f0ee61fc4d13c0eb18ab5d542b349c0eab5b4 Author: Mark Johnston AuthorDate: 2026-11-16 17:34:26 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 17:34:26 +0000 mac: Fix a couple of bugs in prison label handling In mac_get_prison(), mac.m_string points to a user address; the string is copied in by mac_label_copyin_string(). If an error occurs before that copyin, we end up freeing a user-controlled pointer. In mac_set_prison_prepare(), the string is leaked. Fix both problems. While here, make free_copied_label() a bit more robust to bugs in callers. Fixes: bd55cbb50c58 ("kern: add a mac.label jail parameter") Reviewed by: olce, kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61596 --- sys/security/mac/mac_syscalls.c | 25 ++++++++++++++++++------- sys/security/mac/mac_syscalls.h | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 5a5d4b1b7161..39fcab60ece1 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -150,9 +150,10 @@ mac_label_copyin(const void *const u_mac, struct mac *const mac, } void -free_copied_label(const struct mac *const mac) +free_copied_label(struct mac *const mac) { free(mac->m_string, M_MACTEMP); + mac->m_string = NULL; } int @@ -321,6 +322,11 @@ mac_get_prison(struct thread *const td, struct prison *pr, bool locked = true; mtx_assert(&pr->pr_mtx, MA_OWNED); + + /* + * mac.m_string is a user-controlled pointer, don't pass it to + * free_copied_label() until mac_label_copyin_string() has replaced it. + */ #ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { struct mac32 mac32; @@ -342,7 +348,7 @@ mac_get_prison(struct thread *const td, struct prison *pr, intlabel = mac_prison_label_alloc(M_NOWAIT); if (intlabel == NULL) { error = ENOMEM; - goto out; + goto out_nomac; } if ((mac_labeled & MPC_OBJECT_PRISON) != 0) @@ -360,7 +366,7 @@ mac_get_prison(struct thread *const td, struct prison *pr, error = mac_label_copyin_string(&mac, &u_buffer, M_WAITOK); if (error) { vfs_opterror(opts, "mac.label: string copy failure"); - goto out; + goto out_label; } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); @@ -376,10 +382,12 @@ mac_get_prison(struct thread *const td, struct prison *pr, error = copyout(buffer, u_buffer, strlen(buffer)+1); out: - mac_prison_label_free(intlabel); free_copied_label(&mac); free(buffer, M_MACTEMP); +out_label: + mac_prison_label_free(intlabel); + out_nomac: if (locked) { MPASS(error != 0); @@ -427,7 +435,8 @@ mac_set_prison_prepare(struct thread *const td, struct vfsoptlist *opts, */ if (!(mac_labeled & MPC_OBJECT_PRISON)) { vfs_opterror(opts, "no labelled jail policies"); - return (EINVAL); + error = EINVAL; + goto out; } intlabel = mac_prison_label_alloc(M_WAITOK); @@ -435,11 +444,13 @@ mac_set_prison_prepare(struct thread *const td, struct vfsoptlist *opts, if (error) { mac_prison_label_free(intlabel); vfs_opterror(opts, "internalize_label error"); - return (error); + goto out; } *mac_set_prison_data = intlabel; - return (0); +out: + free_copied_label(&mac); + return (error); } int diff --git a/sys/security/mac/mac_syscalls.h b/sys/security/mac/mac_syscalls.h index 76c8e6d188bb..3ea115102e95 100644 --- a/sys/security/mac/mac_syscalls.h +++ b/sys/security/mac/mac_syscalls.h @@ -21,7 +21,7 @@ int mac_label_copyin(const void *const u_mac, struct mac *const mac, char **const u_string); -void free_copied_label(const struct mac *const mac); +void free_copied_label(struct mac *const mac); int mac_set_proc_prepare(struct thread *const td, const struct mac *const mac, void **const mac_set_proc_data);