From nobody Thu Apr 3 19:32:11 2025 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 4ZTBhD01VMz5sLmv; Thu, 03 Apr 2025 19:32:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTBhC6240z3SKZ; Thu, 03 Apr 2025 19:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708731; 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=HvsYpVAfW+GpM/xhazlkhItOFkcUZHct+DYC+2RibMk=; b=mchdALnMB62g2FCzgWktg9WlG4pu1E5mJmAKte46Hny7UE2vJNivWzLLSJlBoAnlh70hWP mN2GezrDbnrZlgq6EtOubVmHz+J3cvErLm5RIHr58Dq9Vuw1CUaDb1kflfCmRgGy43yPHw /Ppf160E0nUt1iFFQS1paLKVbd2QANC2B/NUsIKx+yEEeijOTzQHrZYN3tcMzs/4auAYRK YZCixQcGPpaIhALx0nqHr9el9WVwHjpmeYRBCdeQX1dhlLc/C2j1MhNIa9ZuU09nstt7QP JrmAVD70U3hsYPf9QnwAmcNWRYeY5AEwISM3JpP0js1XMlQUMimeNKEEJZsSWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708731; a=rsa-sha256; cv=none; b=HF48X2FWAcBHcDKmov2Qfu06aHjAn3yvolXKimY7ef4Jyv4+sJKDrqZWLjtdMkcQMQjFXl 1fGoucj9slE1/Z2BlBNwRAX2HX5ALx1ZY+2XkPoPk4v93ZvwxfiN5cBAjmsAIzW4N+beIV dsReqhvcw2hwtHzLv7N8qFhm/ME9yXar/yP/IKsIOGXGzXPKaU5JHjYQUUtJ9Uds7qgaYQ Jo9LfOw0Cx8pGMTEKq+KF8kTagGVJFCTFrc3gEvgbhcMWEnl4ZOmJ7MXsr8+l/YpanCu9x Chhj4vo8KGltfE0vsS3Y9yoH+zk6QD9JfxIm6A6OPHcAEwSsegFe9r9xJxKP9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708731; 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=HvsYpVAfW+GpM/xhazlkhItOFkcUZHct+DYC+2RibMk=; b=T/SW+BLVxIX6aRcVGTWn0P57ultyJaHjBDTbB+/eLvh+Nm9lHcMCyk4UFblZ8KoyKfj87E LoAp2PXRBmKpolQ+MRhFd+wKz0VQDrnYfmOFOTVYUQXjbXwSi1iWF2NoyBto8bBUcSAQKx 7lEUtB0k3n8kgKJE/CdYjCrWp5Zxy2GAo4u/vZUIk3CUfc2rZt9cOjU61HGNBN/HnxNuhZ Maa7DKuia39uvNSqKNbkQvFTir8RFiTXlqVVwFWDE7cKYOSYOu0l/yHsat5qn3TgWGtsx0 OyDusF3h/bDmZYp0+f24JvxOHNbQ0EvubUohB5EFCwPY1FDaNAyR9d4Y90xCaQ== 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 4ZTBhC5QsHzmt; Thu, 03 Apr 2025 19:32:11 +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 533JWBbs040020; Thu, 3 Apr 2025 19:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWBpK040017; Thu, 3 Apr 2025 19:32:11 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:11 GMT Message-Id: <202504031932.533JWBpK040017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 3c77f39d2ae6 - stable/14 - MAC/do: Sysctl knobs/jail parameters under MAC's common nodes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c77f39d2ae647114b6ad4c5b108387f3c6818c1 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3c77f39d2ae647114b6ad4c5b108387f3c6818c1 commit 3c77f39d2ae647114b6ad4c5b108387f3c6818c1 Author: Olivier Certner AuthorDate: 2024-07-04 09:51:00 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:00 +0000 MAC/do: Sysctl knobs/jail parameters under MAC's common nodes Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47608 (cherry picked from commit f3a06ced25681b6da40c652203f882ba18be227d) --- sys/security/mac_do/mac_do.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index a57c29c407b8..6f68a6f62a79 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -23,8 +23,6 @@ #include -SYSCTL_DECL(_security_mac); - static SYSCTL_NODE(_security_mac, OID_AUTO, do, CTLFLAG_RW|CTLFLAG_MPSAFE, 0, "mac_do policy controls"); @@ -338,8 +336,8 @@ SYSCTL_PROC(_security_mac_do, OID_AUTO, rules, "Rules"); -SYSCTL_JAIL_PARAM_SYS_NODE(mdo, CTLFLAG_RW, "Jail MAC/do parameters"); -SYSCTL_JAIL_PARAM_STRING(_mdo, rules, CTLFLAG_RW, MAC_RULE_STRING_LEN, +SYSCTL_JAIL_PARAM_SYS_SUBNODE(mac, do, CTLFLAG_RW, "Jail MAC/do parameters"); +SYSCTL_JAIL_PARAM_STRING(_mac_do, rules, CTLFLAG_RW, MAC_RULE_STRING_LEN, "Jail MAC/do rules"); @@ -361,10 +359,10 @@ mac_do_jail_get(void *obj, void *data) int jsys, error; rules = find_rules(pr, &ppr); - error = vfs_setopt(opts, "mdo", &jsys, sizeof(jsys)); + error = vfs_setopt(opts, "mac.do", &jsys, sizeof(jsys)); if (error != 0 && error != ENOENT) goto done; - error = vfs_setopts(opts, "mdo.rules", rules->string); + error = vfs_setopts(opts, "mac.do.rules", rules->string); if (error != 0 && error != ENOENT) goto done; prison_unlock(ppr); @@ -380,14 +378,14 @@ mac_do_jail_check(void *obj, void *data) char *rules_string; int error, jsys, len; - error = vfs_copyopt(opts, "mdo", &jsys, sizeof(jsys)); + error = vfs_copyopt(opts, "mac.do", &jsys, sizeof(jsys)); if (error != ENOENT) { if (error != 0) return (error); if (jsys != JAIL_SYS_NEW && jsys != JAIL_SYS_INHERIT) return (EINVAL); } - error = vfs_getopt(opts, "mdo.rules", (void **)&rules_string, &len); + error = vfs_getopt(opts, "mac.do.rules", (void **)&rules_string, &len); if (error != ENOENT) { if (error != 0) return (error); @@ -409,10 +407,10 @@ mac_do_jail_set(void *obj, void *data) char *rules_string; int error, jsys, len; - error = vfs_copyopt(opts, "mdo", &jsys, sizeof(jsys)); + error = vfs_copyopt(opts, "mac.do", &jsys, sizeof(jsys)); if (error == ENOENT) jsys = -1; - error = vfs_getopt(opts, "mdo.rules", (void **)&rules_string, &len); + error = vfs_getopt(opts, "mac.do.rules", (void **)&rules_string, &len); if (error == ENOENT) rules_string = ""; else