From nobody Fri May 29 16:01:49 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 4gRp5B37VQz6fl1v for ; Fri, 29 May 2026 16:01:50 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRp596rFkz3Hnc for ; Fri, 29 May 2026 16:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780070510; 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=Kf13hkR21h3J+YjRxSmS1FGfLWu695wGrh7XOKzKYdk=; b=NV2gDY/FgjzLtrK6rsIS4Vk/rtL7ebfAdwG0pTgh9ifJIo/19SDX6hDy1LWk1AT+Fqm7TV ZjuOt8rHdCDfdeWpOcvgStfX20xeCTfH0X+6NCLfwRW85nsPWezrQzh6gKvwjVunIh0JUW +jzNATuZuAUcNjVucxeALR3qoFXc/x6hbfI/ETFRflKGVXbRFveIss6fi2yoAZDYxpk9H/ 8msiacr5+9MEn6ioEEA1Oq+bBSN9czdnw6pw1+AajiqRuKnrBN/9tweMnOva6dNMF/wcNS fnV0CXwiXiLZErwc3++JWYfzl8kMdpFr4X6cSTL6efRhiA7nyoW70hr/kjd6tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780070510; a=rsa-sha256; cv=none; b=se+xEnMl9zqShYF7aU2CcMigE7sPQ123WCx8p8m92lOIiPHBBI9wihmDGBr17cnbwE6j4+ Q/83A/HlMSWcCC04OTsalYmeoniczgqfc8fOw3TfV6Uay66seJPEk44HmvHeYxo5yuphQx 2ji05hRukZ8lOK2gDVBfMT+0U1Gbu9/duMql5HgCohSN83v7vwTO9QDa69ctlQCBLlpxF2 BDlTtbU6yIVDA5zl9sQdnmsHh2UkSuxRACLnXXO5QnLJao1Ea7HB7n7GdUlxaj093KB64K HuT00Kd3Vnvy2wLjtrvL6dGM84ILOgSb9C4sS5i8k3HFrFzvzaDC1kQTee8Vgw== 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=1780070510; 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=Kf13hkR21h3J+YjRxSmS1FGfLWu695wGrh7XOKzKYdk=; b=kg/TQdnS7JAwnLPMnhhf76OPUVO0ignYUbwidBYAO8J6upcdl+swY7IYmW4iaV5SdxkCxD 0dKJtAPh0PTlmeeZVAK0gaSOQVLlv+XPkdr1zInOD+SXA911Yx8L5Yks7mfWr00oqjdRY0 3uKaiflsc53wj6cY1FYM2c1kGksP8XW1T0ZhNn54wBDqZ0c9FcTlhVYZ8sMLu5ExekFzy5 XBFnrUL9oSSTIWIoXq0fnlAa8fZMPuoc3xzsZc0hWlSS2UNtrwMNDnIQfkqTFWglzlMYNz n+d8Pgm0kPFAu3gTu2oD/7pEu/40XH4lPpQcygtYa+uGvngUAIEuEb+TjGzhPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRp596MLtzgpS for ; Fri, 29 May 2026 16:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 338f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 16:01:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 51cc5840b66c - main - MAC/do: Configuration: Fix default values: Remove jail creation method 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 List-Id: 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51cc5840b66c9565e1740c1198a0e684d81e3734 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 16:01:49 +0000 Message-Id: <6a19b86d.338f5.e63f434@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=51cc5840b66c9565e1740c1198a0e684d81e3734 commit 51cc5840b66c9565e1740c1198a0e684d81e3734 Author: Olivier Certner AuthorDate: 2026-04-28 13:10:14 +0000 Commit: Olivier Certner CommitDate: 2026-05-29 15:27:57 +0000 MAC/do: Configuration: Fix default values: Remove jail creation method mac_do_jail_create() would create a default configuration on the just-created jail, erroneously causing mac_do_jail_set() to then retrieve it and use it as a model when determining the default values for not-specified parameters, instead of using the configuration applicable to the parent jail. Setting a default configuration in mac_do_jail_create() had been done as a kind of defensive measure to prevent a created jail not to have a configuration (effectively making it inherit from an ancestor jail, which is a security hazard except if explicitly requested). However, this measure was never really effective (osd_jail_call(PR_METHOD_CREATE) in kern_jail_set() calls the PR_PETHOD_CREATE methods in an unspecified order, and stops at the first error), so we are forced to rely in any case on the fact that an error in a PR_METHOD_CREATE or PR_METHOD_SET method leads to stopping the jail creation process (which is the case today; see kern_jail_set()). Reviewed by: bapt Fixes: 9818224174c4 ("MAC/do: Executable paths feature (GSoC 2025's final state)") MFC after: 1 month Sponsored by: The FreeBSD Foundation Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/38 --- sys/security/mac_do/mac_do.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 7890af9bcfec..fb7eb00cd6d5 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1548,16 +1548,6 @@ SYSCTL_PROC(_security_mac_do, OID_AUTO, exec_paths, SYSCTL_JAIL_PARAM_STRING(_mac_do, exec_paths, CTLFLAG_RW, MAX_EXEC_PATHS_SIZE, "Jail MAC/do executable paths"); -static int -mac_do_jail_create(void *obj, void *data) -{ - struct prison *const pr = obj; - - set_default_conf(pr); - - return (0); -} - static int mac_do_jail_get(void *obj, void *data) { @@ -1879,12 +1869,14 @@ mac_do_jail_set(void *obj, void *data) /* * OSD jail methods. * - * There is no PR_METHOD_REMOVE, as OSD storage is destroyed by the common jail - * code (see prison_cleanup()), which triggers a run of our dealloc_jail_osd() - * destructor. + * There is no PR_METHOD_REMOVE method, as OSD storage is destroyed by the + * common jail code (see prison_cleanup()), which triggers a run of our + * dealloc_jail_osd() destructor. There is neither a PR_METHOD_CREATE as + * PR_METHOD_SET is called just after (or the created jail destroyed if some + * PR_METHOD_CREATE fails), and our mac_do_jail_set() will ensure a jail is + * properly configured. */ static const osd_method_t osd_methods[PR_MAXMETHOD] = { - [PR_METHOD_CREATE] = mac_do_jail_create, [PR_METHOD_GET] = mac_do_jail_get, [PR_METHOD_CHECK] = mac_do_jail_check, [PR_METHOD_SET] = mac_do_jail_set,