From nobody Thu Apr 03 19:32:19 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 4ZTBhN0B3Wz5sM1n; Thu, 03 Apr 2025 19:32:20 +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 4ZTBhM5Vlkz3STW; Thu, 03 Apr 2025 19:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708739; 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=rwx/EMYQlwBBGixLz2wWKQbgQugavEYfZkQ3bGBsus0=; b=OQZ7++9niy3g5AnU7T6lLQTyaYyDlabTTAFbCeIU240dueeOKak3qqNUoEtw1i/FC9t7NE rqJiu7XHm8D0Cjk399olcbQ3uGOsXXFGUcW9J5mJm3M4AijYA6eEf6p8FvqQSHPbZsxPQk GGJgocQH6zNcLCXwaSXTVkY7qUsa5uDfXXxaa9ljiSp9UJr+hIwf5o2b0b9w4GJO8yBK8Q yM1ldUlWRu1RT+QRy5StebpXLCBLdSm+4F0WkRnt+8Ewd+M8KjQUSaMzZu5KDYTcBJzT2p thgbztcPpEV6MIs06i4nPvUwQGCzRAjnHG16JJppbwyYti7tlB907mSOMmjEDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708739; a=rsa-sha256; cv=none; b=pfCQzCyaiojlUc450PcQQlRYzowLhFH4ZJ2+yFaq26N8mH3wshcp39nsg7e8qSf5sTHVul ZAB5ZKAmdZ2OXZYv5GJTUoO32PjtUxv1Wp1AJF2nHbhdV/L//GeA8tdDdo0BvAj27Zb+ed uknZtPub1tLimG1gnGcjj35ntu/39rQniiP6jVgBHFkDHdJW1s5fwfG3sknzwBtSun9Nbe JQL3+D9YaBe1QPVQtupeEhxTLIlm2zSlMJFfy4X7SfV9CxnabGkn6FdqXn6eDPcWp86pIk DxCc4ToS3YT5LVvUcS0sQLGdofgzRm66OUHUinGyHZYy2w8H6Vagx26Ubaloog== 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=1743708739; 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=rwx/EMYQlwBBGixLz2wWKQbgQugavEYfZkQ3bGBsus0=; b=RvywzDAxek3pzMv6/rnQDK9zMjGgb5ShcQ6XcdPCJ5ewoN6H8hfIri29+10oYPYpZbiabM yWfoKEly/SBuFhcjCjHdhKVqF4gljcvXbdFcbq0G14ccUEa9mIfODUfoR4tCDu4yajey43 P+Gr6AzH6Grh5RrPkF0ss/kbEvmSWhB77TvIVpNO9WQiFsHypz6EgqDOPmvd3qslUAqxGj x19lgXm4z9vOXFawWx6nPiGpqMN2NinLaC2+FwG/O8tbK+aKTaOI6XnOi4JtXWdteVwgeA /++NIomE/Fuz6yvT/aVvxLrv0KHpGr9BnVXePrs5eRaTKpi0pPj11cswt+iZ4A== 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 4ZTBhM4zYmz1Cpx; Thu, 03 Apr 2025 19:32:19 +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 533JWJjf040258; Thu, 3 Apr 2025 19:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWJ9P040255; Thu, 3 Apr 2025 19:32:19 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:19 GMT Message-Id: <202504031932.533JWJ9P040255@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: 8e605d88c2f1 - stable/14 - MAC/do: Ease input/output of ID types 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8e605d88c2f1ed3fea26fb5017a76d02952b47eb Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8e605d88c2f1ed3fea26fb5017a76d02952b47eb commit 8e605d88c2f1ed3fea26fb5017a76d02952b47eb Author: Olivier Certner AuthorDate: 2024-07-05 13:30:15 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:02 +0000 MAC/do: Ease input/output of ID types Have a static constant array mapping numerical ID types to their canonical representations ('id_type_to_str'). New parse_id_type() that parses a type thanks to 'id_type_to_str' and with a special case to accept also 'any'. Have parse_rule_element() use parse_id_type(). A later commit will add a second call to the latter for the destination ID. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47615 (cherry picked from commit 65766063f85d8b8fe8b24a50250a12a122974c26) --- sys/security/mac_do/mac_do.c | 49 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index e13684c15dab..5bec02ee2e56 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -38,10 +38,20 @@ static MALLOC_DEFINE(M_DO, "do_rule", "Rules for mac_do"); static unsigned mac_do_osd_jail_slot; +#define RULE_INVALID 0 /* Must stay 0. */ #define RULE_UID 1 #define RULE_GID 2 #define RULE_ANY 3 +static const char *id_type_to_str[] = { + [RULE_INVALID] = "invalid", + [RULE_UID] = "uid", + [RULE_GID] = "gid", + /* See also parse_id_type(). */ + [RULE_ANY] = "*", + NULL +}; + /* * We assume that 'uid_t' and 'gid_t' are aliases to 'u_int' in conversions * required for parsing rules specification strings. @@ -129,11 +139,36 @@ strtoui_strict(const char *const restrict s, const char **const restrict endptr, return (0); } +static int +parse_id_type(const char *const string, int *const type) +{ + /* + * Special case for "any", as the canonical form for RULE_ANY in + * id_type_to_str[] is "*". + */ + if (strcmp(string, "any") == 0) { + *type = RULE_ANY; + return (0); + } + + /* Start at 1 to avoid parsing "invalid". */ + for (size_t i = 1; id_type_to_str[i] != NULL; ++i) { + if (strcmp(string, id_type_to_str[i]) == 0) { + *type = i; + return (0); + } + } + + *type = RULE_INVALID; + return (EINVAL); +} + static int parse_rule_element(char *element, struct rule **rule) { const char *from_type, *from_id, *to, *p; struct rule *new; + int error; new = malloc(sizeof(*new), M_DO, M_ZERO|M_WAITOK); @@ -141,12 +176,16 @@ parse_rule_element(char *element, struct rule **rule) if (from_type == NULL) goto einval; - if (strcmp(from_type, "uid") == 0) - new->from_type = RULE_UID; - else if (strcmp(from_type, "gid") == 0) - new->from_type = RULE_GID; - else + error = parse_id_type(from_type, &new->from_type); + if (error != 0) goto einval; + switch (new->from_type) { + case RULE_UID: + case RULE_GID: + break; + default: + goto einval; + } from_id = strsep(&element, ":"); if (from_id == NULL || *from_id == '\0')