From nobody Fri Jan 16 00:24:22 2026 X-Original-To: dev-commits-src-main@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 4dsgZv21Y6z6NPyt for ; Fri, 16 Jan 2026 00:24:23 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsgZt60wdz3ZrD for ; Fri, 16 Jan 2026 00:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768523062; 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=xYS/oh6MHaypOOjotsqXGGogK0Qz0YhyDeFBrQWl3zg=; b=js1F2MPLYNC7dCAU6P2JnZaGcwX7mxYvzkpqElgij13GiMv8GiSOIdUiKj6BTdV+LpS98G 6NLHN1gOU+hiqXDzhPuwd7rp1SUiysQqixn7SC/db3I3+td+CYc7DiZs9tg/Qits7M/lar dWa6HMm+uy6GqiN2TQil2p9sNVXscWVXfs3RgZ6m/yMtbCoUw5frDUQ5E3L7A5cCWwl/iN f1UNFkT5hE5IFB/frJUurfvWemPpt1VcFH+wgCyT8PpxCO9pOxaB41egiOO9rTk9QpZjMe cZXa4DwYJz+OmDSoNwEcbMgx7AbJuY0VW//KhWV/W8Z3gAHP8ZQh9huw/wvXpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768523062; 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=xYS/oh6MHaypOOjotsqXGGogK0Qz0YhyDeFBrQWl3zg=; b=WaziS2if3olsxv4gEDtzh+2oXI/d9BKdmUO7DKNy0Er3xFgFT5BIppeptNearwAZWhRQuR ISp5Bk8snXx2qE+/ObMlQHnX2IzGGb1e0cPILe/IH/bwbUFF1L39POYVkxSgNRlgxIvWtE s4lw4+MLqQenvvvGL++wE5b0/8HQAjbDx5YZCTCVKjIyrh9x7Y7snBnLHOFtzmyxAQSY2Q 2UrUqGobkJPzMmUFjIPF069ZQEaQ0rg2zhhKo3OtnmyP+2XObWMgz7yK0nxdwBI3jptIlw +jtF0v5t7M0d9imMo1tH0MD2ryDexTB4ICEevf+IKphvi6BJvKg2+/9Gac+85A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768523062; a=rsa-sha256; cv=none; b=HrK6bnE6ZKr4etJ2wpA0aUIAaArIFKe3GE36Kay9Rio+IwH6NKPykRbIgkVl/yO2lWhkL8 VvaS9dIb+GgPPgpPC+KbP7aWdoObGixQ0ojaDKpkPT7vfG5ylrTAH58IRrotu5ETVKnT/j 9ERObAQugKqXJNrEf75TItyTOd5FJD8BJlCfVwnx2Nf/CmGc0uSl1fSmTmAOtLA2m+QiCm eGpEGXWu1Zz9Y3AYD2UY2QLypxQM/Bg2fcWr0mzzpSNqXC+0yhM7arVhwEU6gmncK65xd6 dRP9VAR+qXD4t639+Tp4vkb0BrzlWbN9t4zw0KfObqbJsDNo9hLy50y/U72noA== 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 4dsgZt5B6dzqqC for ; Fri, 16 Jan 2026 00:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ff6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 00:24:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 626fe12e2801 - main - kern: mac: pull mac_label_copyin_string out List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 626fe12e2801a06c59eaa056ecf11f573e30ecbb Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 00:24:22 +0000 Message-Id: <69698536.39ff6.518cbce6@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=626fe12e2801a06c59eaa056ecf11f573e30ecbb commit 626fe12e2801a06c59eaa056ecf11f573e30ecbb Author: Kyle Evans AuthorDate: 2025-11-07 04:15:45 +0000 Commit: Kyle Evans CommitDate: 2026-01-16 00:23:39 +0000 kern: mac: pull mac_label_copyin_string out A future commit to the area will further our jail integration and add a use for this: the struct mac itself was already copied in as part of vfs_buildopts(), so we only need to copyin the strings. We add an explicit flag argument because the jail operation will need to do it while holding the prison lock. Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D53957 --- sys/security/mac/mac_syscalls.c | 48 +++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 3e9908fb9da9..2a8b8d1f18ce 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -90,6 +90,35 @@ struct mac32 { }; #endif +static int +mac_label_copyin_string(struct mac *const mac, char **const u_string, + int flag) +{ + char *buffer; + int error; + + error = mac_check_structmac_consistent(mac); + if (error != 0) + return (error); + + /* 'm_buflen' not too big checked by function call above. */ + buffer = malloc(mac->m_buflen, M_MACTEMP, flag); + if (buffer == NULL) + return (ENOMEM); + + error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL); + if (error != 0) { + free(buffer, M_MACTEMP); + return (error); + } + + MPASS(error == 0); + if (u_string != NULL) + *u_string = mac->m_string; + mac->m_string = buffer; + return (0); +} + /* * Copyin a 'struct mac', including the string pointed to by 'm_string'. * @@ -101,7 +130,6 @@ int mac_label_copyin(const void *const u_mac, struct mac *const mac, char **const u_string) { - char *buffer; int error; #ifdef COMPAT_FREEBSD32 @@ -122,23 +150,7 @@ mac_label_copyin(const void *const u_mac, struct mac *const mac, return (error); } - error = mac_check_structmac_consistent(mac); - if (error != 0) - return (error); - - /* 'm_buflen' not too big checked by function call above. */ - buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL); - if (error != 0) { - free(buffer, M_MACTEMP); - return (error); - } - - MPASS(error == 0); - if (u_string != NULL) - *u_string = mac->m_string; - mac->m_string = buffer; - return (0); + return (mac_label_copyin_string(mac, u_string, M_WAITOK)); } void