From nobody Thu Feb 13 10:23:52 2025 X-Original-To: dev-commits-src-branches@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 4Ytrr94qckz5nJ7X; Thu, 13 Feb 2025 10:23:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytrr85gY6z3b10; Thu, 13 Feb 2025 10:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442232; 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=asRd7s9wZi7YqcYnnjOzbPpyjJTuNJaiBeLqCPt3+Kc=; b=EON9qgb0fcRUddPGyMjkaLyyPZ6xFwGFb5VLACFL2txEOjarYu+OwDZ2TWUbgQF/XIvefa CrKZ095PAeM3xT6qa6HO4dvFlc7DPrdUd1IbXYP/RlRcqiis3k3miNGDjL+LUGozYKFUHw DabKypF75elGvxub65/NRbkp5tJh7wgm65HoJDjEheAFyYYMYaV4u5rI8vMhkUVuDiVktD o+u5ZZ4T3xKnk3z9lXJrn/d1oNyGf2uOGE/lrNoIQOOSVVc/rEwN0CXJfsI/rQbNsm0VZk USUQOVswOlF8RsgLdcvWnmb6FTbei8oDGXaVHmVwQHsXxl1l6RrYKbut/qUkAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442232; 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=asRd7s9wZi7YqcYnnjOzbPpyjJTuNJaiBeLqCPt3+Kc=; b=fGV6C8NOpwQOf6Eg7ukuZdnFceOoaZ+uOv2JuYqVoiytxyoN0uum3Ofe8SK6HWL7aMw7mf vXO27Uk07/Be33z/4aPKkfw4qskBJ6oVgiI5ming9gEgH8P4+Fxg9npa1DpNkQPr0Xj4zF 1FEj175EXVatahe99/omEKj0pd/FJdxVP2Yy77LMQ2jpwYc2aphf+IdVL061X/pYJxWfUX /hyFJ1P0H7IDEAxq2iyMqqJhVs0L0QtdoQlBjsuh49Vv/qA3pdp9S/C4nihSRBp+ZYD7vn 9AT4yLzU516ZtX3B2Ncmzd98mEV8yVx/4IXZ7srvEUMAMjHCjKdlCGqb6yPZhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739442232; a=rsa-sha256; cv=none; b=xAmWyYN3VwxCSF90l0ucO5psFyNpyq/qYwZqvrUURQnfx/S9/Wf70DqBW/SscL2eMXuxm9 PRydQQvUUX1MiRwUka9RKmKC9vBek0ONKiuMg0Ku5FmeLaoxkLUMBefxj2GPMYJFUnuYly kqUa468BWmmDBPQw/gmg+OQhmtG5Gbq8ORX6jQaboWSjTXowqhybs5JxxWk0SiB/EccoCz M2MGg9fxCL9UuSnmP0MEPvnR+meCiSfZw/mhE3FDSmdkrPQS2Zzs/7jPARJLuSSbFJ8wh4 eJM4r8BvgGz0kiFGqnCj+FTnykBDPCkxatFpD55/8xgqirJBhDh/GX7434cCnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ytrr84gSFzhVh; Thu, 13 Feb 2025 10:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DANqvT030209; Thu, 13 Feb 2025 10:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DANqKP030206; Thu, 13 Feb 2025 10:23:52 GMT (envelope-from git) Date: Thu, 13 Feb 2025 10:23:52 GMT Message-Id: <202502131023.51DANqKP030206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 87836ab994c2 - stable/13 - MAC: mac_biba, mac_lomac: Fix setting loader tunables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 87836ab994c2ff9d442f84c174bd1fdead3cfa27 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=87836ab994c2ff9d442f84c174bd1fdead3cfa27 commit 87836ab994c2ff9d442f84c174bd1fdead3cfa27 Author: Zhenlei Huang AuthorDate: 2025-02-09 15:53:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-13 10:23:03 +0000 MAC: mac_biba, mac_lomac: Fix setting loader tunables A string loader tunable requires setting the len parameter to a nonzero value, typically the size of the string, to have the flag CTLFLAG_TUN work correctly [1] [2]. Without this fix security.mac.{biba,lomac}.trusted_interfaces would have no effect at all. [1] 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag to automatically ... [2] 6a3287f889b0 Fix regression issue after r267961. Handle special string case ... Reviewed by: olce, kib Fixes: af3b2549c4ba Pull in r267961 and r267973 again ... MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48898 (cherry picked from commit 7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4) (cherry picked from commit 04f360b782205c799b9302ba8bd810f7a303017f) --- sys/security/mac_biba/mac_biba.c | 3 ++- sys/security/mac_lomac/mac_lomac.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 8b683dc380eb..04dd331835be 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -110,7 +110,8 @@ SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/Biba"); static int max_compartments = MAC_BIBA_MAX_COMPARTMENTS; SYSCTL_INT(_security_mac_biba, OID_AUTO, max_compartments, CTLFLAG_RD, diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index d878f9a7b965..7a2f340d85bc 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -111,7 +111,8 @@ SYSCTL_INT(_security_mac_lomac, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_lomac, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/LOMAC"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/LOMAC"); static int ptys_equal = 0; SYSCTL_INT(_security_mac_lomac, OID_AUTO, ptys_equal, CTLFLAG_RWTUN,