From nobody Thu Apr 03 19:32:15 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 4ZTBhH42KYz5sM34; Thu, 03 Apr 2025 19:32:15 +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 4ZTBhH1WY5z3SSm; Thu, 03 Apr 2025 19:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708735; 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=8bWInagmaisdctugBFzThOVGojwk1hwhOGYQ35WIfao=; b=uHkSu9FeGnrYdcNdRmDqhAgBwSt7YCa9Cv2NfAOTNF6BMHrKFTYieN2odrya/qZMOgytOi AFppxpP4PxPQ4yvirNBZToV+IfWmfzutIC75xRyzlMloFGIlwryDU1WSXjTBErlD0WyXv3 sHQD8+XkgSKp0f2/H0oTb9bt+TVMDitcZuIUr2U6+usQI3UflF0UHhIqjrWtwX4k0EVBNG xsusR082ji3We9k6ViLlwflO2fdoKHt6L5RA/OOe6ocUIgEzLYbAbsWsefcuBpZVoTNfZa cZrOCDEPYZ9t8GLtID6+Twdy8DfggJjDnjrzqc4hB2JUkPud1HL1nDoopZ8wmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708735; a=rsa-sha256; cv=none; b=Et8wO2QrfKBnxbMxTPn0BUzKzYXo11j+wKF5NYV6zxNfvScyCA6ZaICqIe6FNnfZYCBWmM iKkkmnp2sGjjcoEXA6s8HIr7ub0G5EvZ6u/mmZ8ibCgwvthiLPJmGCXkIcMNfM2fexGtzW 3GlQWu+eCxW4rki/rFPPCvyUTd8tBGz93iwH/R6l+h+Bfo0Df5XEsA0W0/0x1oaKGIec5/ btosMQR8vlwbAvVBntnmq2m4NkA7YXcOhe+oW0hmD4v7BFMh+G4gWcO0cmCQM9nBt4ZTQt LN0F2GlOPiQ2iMdcrWV4DrZOujpz+zfEkL54pcK1JgGmlpdLSqhfJ+0saCbCgQ== 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=1743708735; 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=8bWInagmaisdctugBFzThOVGojwk1hwhOGYQ35WIfao=; b=WoXezcXGppCJ+cEQjB2VzkghytkrGG0e0QEFXbxRQxwItz20Jr6UMus4KtqzThEpos8VFR t1naVtzn6s65nLNBVxqLOC0zhAVCcUdq4U+0nwTeaFuk6U8RcBBZDd9sLkQaVpYB61pgyJ abLLzlCpK/86/4G71stB8zujY4KX97MtvwoSgBdLZBcH1XDAXb98tJgNuoXsP241feVYVB pSAEgQghQVQ/TMaUgq9a5r5a4DJvSoN+t7ojSLXIrm0TyM4HRfSW6BvZpF/nACYikeVirg jP8QmBJbM1VOZcZmG2C5VIcXFNiOn0y1aTOweH/TWiIJwZh6UA0JbCTcP1HoEg== 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 4ZTBhH15G3z1Cm1; Thu, 03 Apr 2025 19:32:15 +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 533JWF41040123; Thu, 3 Apr 2025 19:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWFgD040120; Thu, 3 Apr 2025 19:32:15 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:15 GMT Message-Id: <202504031932.533JWFgD040120@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: 9195f21e0f34 - stable/14 - MAC/do: parse_rule_element(): Style, more clarity 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: 9195f21e0f34bc4132e4a4fc9229bf828b0e7164 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9195f21e0f34bc4132e4a4fc9229bf828b0e7164 commit 9195f21e0f34bc4132e4a4fc9229bf828b0e7164 Author: Olivier Certner AuthorDate: 2024-07-04 16:35:47 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:01 +0000 MAC/do: parse_rule_element(): Style, more clarity Add newlines to separate logical blocks. Remove braces around 'if's non-compound substatements. No functional change (intended). Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47611 (cherry picked from commit e4ce30f8da612db96410b66cccf9fc12ccce282a) --- sys/security/mac_do/mac_do.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index ed1d0bcfa43c..4ef9b68bf513 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -94,19 +94,22 @@ parse_rule_element(char *element, struct rule **rule) error = EINVAL; goto error; } - if (strcmp(type, "uid") == 0) { + + if (strcmp(type, "uid") == 0) new->from_type = RULE_UID; - } else if (strcmp(type, "gid") == 0) { + else if (strcmp(type, "gid") == 0) new->from_type = RULE_GID; - } else { + else { error = EINVAL; goto error; } + id = strsep(&element, ":"); if (id == NULL) { error = EINVAL; goto error; } + switch (new->from_type) { case RULE_UID: new->f_uid = strtol(id, &p, 10); @@ -121,13 +124,14 @@ parse_rule_element(char *element, struct rule **rule) error = EINVAL; goto error; } + if (element == NULL || *element == '\0') { error = EINVAL; goto error; } - if (strcmp(element, "any") == 0 || strcmp(element, "*") == 0) { + if (strcmp(element, "any") == 0 || strcmp(element, "*") == 0) new->to_type = RULE_ANY; - } else { + else { new->to_type = RULE_UID; new->t_uid = strtol(element, &p, 10); if (*p != '\0') {