From nobody Sun Feb 9 15:55:21 2025 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 4YrXNV1Sdmz5mbnr; Sun, 09 Feb 2025 15:55:22 +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 4YrXNV0g6Rz3XHf; Sun, 09 Feb 2025 15:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739116522; 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=3k0By3K0rmezrHsUc3P9o8CpK8GNZvv3J4jfDf3DFe0=; b=OwVtDPjKIFZvwxpVe/gWGh6U5KqIWHTzgD7ujk4+/JJtf+lU4KQaGrXjQ7uJSaJmt2nR/c zw5bTb3LFOBKxHbEnRENUtFY2/0ZPpyk4p1J412wktzk5GPVRc3yn8sU4RwJu7/AgjJtqC KIC3NAYteLGXYi00N1b1ufjdO65hmwjZXRcWKzG9ErYXmFOMgaQP672n3wu+Lm3fgZuPC6 04lSJWAvc/Vojq1qz6alY1dGDtbPa3yo+pM3vD9d9TUHdn+J9aZYCaK6Lfn58Qn7N7ExCG iJAQdHXvDQH1/LPEJdhOV4G4yAAD9shRWnBQ9TMFjXyaBfDo7KAd5DXArx2VtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739116522; 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=3k0By3K0rmezrHsUc3P9o8CpK8GNZvv3J4jfDf3DFe0=; b=i+eNo++i1bPY6L5d+Xj/YFlSKZTlpO5jhdNa1U109f2doDUaCGp9PJT6R4s58iiNzDO9bD PJEL+NhgaVMoObRSMom/w7fkHlIaA0gBc1x02XrQh2V7gNkpown34g7XSA5FPMk0nxSqf+ 06YenpKQqH8S3puMxPDZLMEoqP3IZbEb0fcDvDQEtpm4QVizBv8lptCVcS0CdGjyymtC19 Vrq1GV2udZ6WQEt8+OAoA5h2QoSP4kG5bLsYT2whxEsUviO3Imw44lyQiWvWWC/g4ozO8m mTyE3qvbYXNFHdON7dvq4yDyeqk0l1YkVAtf72oMjTzy0N+WzFv94T4PA4XOeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739116522; a=rsa-sha256; cv=none; b=xzQr8T7VPqQOLYMy0SeVaZ4zR6+1DUH5XxsmkjbY7pOivlfCAzYH6qA5uxIbg+ZDrMNNr1 m7vnWHfAmagrkzQ9RuRpCwOgODCCsLS3D0dGbiSqlyxCxcWv1r9UFxKGBuoZUz+E9yK995 RK67YXTj+cDRFWQOGz1UabxhzFUvk3xZGlMHMTE9jWXAEyIR23JG5MF12E1zkd60UEMkSs CeXdlSHk0u1ndPLoE+brS5dwo/WN68vASGAFM2lypznhbchgrbPUVyHKLYwJFcDhLqCMgH jbWCgxcsLDDe3Ht6U3P6MlbgmziUkNtKW5D94GD1Ept7IcyGJLpKIG/sYBBGzA== 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 4YrXNV0DXmz13Bf; Sun, 09 Feb 2025 15:55:22 +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 519FtLZM045464; Sun, 9 Feb 2025 15:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 519FtLMd045461; Sun, 9 Feb 2025 15:55:21 GMT (envelope-from git) Date: Sun, 9 Feb 2025 15:55:21 GMT Message-Id: <202502091555.519FtLMd045461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 7d4c0fac8c7d - main - MAC: mac_biba, mac_lomac: Fix setting loader tunables 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4 commit 7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4 Author: Zhenlei Huang AuthorDate: 2025-02-09 15:53:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-09 15:53:29 +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 --- 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 e991e05311df..aac7a0545ab8 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 23acc7b7a592..23a996469bc0 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,