From nobody Thu Apr 3 19:31:52 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 4ZTBgs4xKTz5sLrS; Thu, 03 Apr 2025 19:31:53 +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 4ZTBgs0mjRz3RRH; Thu, 03 Apr 2025 19:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708713; 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=YvJrzkxohOKcEg/7sg5PJo8GIKzMqozntT73W1rgzEU=; b=WkHURHb6EkQGrnHiH0Et6Z9UeeMdEo6Z2dr7a7nT67ISOGDyZWgTprweBxiM1cX3C/EZ3c xjmr+5UDONQIVvjj1z7EkHGr/9Ea0tEzQvz779oPWSaa+/EOr1UqFJhvRwZgsSTxkkvhMB l6dIkggXlVD9qrTtaV/nH15OAM/4QCxLWDDuEq+kFI4NajmG83EEDfrmEoaf3MTFuBk4Fy 7JzxnUoqVDqqeA/kxk/LzTVhyUeq3inOqcECCFnN1rv7gz/dFh7C+MR+aw/itNHdHClbXc SkAtEGbpE9W8PK13PxaSXZ31XDBPQm9MsnUb6u3q3NnzzFZAR2/55vwEu2YRUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708713; a=rsa-sha256; cv=none; b=AqP26yyiJInnKCmzCDtoSjkkroXLYcc++4xE9JqnCzdF2amCe7r/NXi+n2rSwzS2lF9LN/ dFi9+Q0771b6vdBjW53BioQAbvfBJC8DA3vbbp/qHd1vXNmBEQOv1/WRa+IALyw4vAbN9C slVd6QFza9BW7/Euh3c6DluHrm9vFAj7Iyw4Tr3+jOd1MGWoGoqOxnYgtGaDfb4dYNMZcZ rsPGXo0FV3MKwWgSQ//7t519quGNSIKOUwZM7CwZmL13E6mGIo85Mnp+eRPBH0bjGCuuDc mgku6Ska9XgGCzWomN3/3MaUXtB7rYsqs1Iq2EaFJbkfvi7yrXIJ8liqtaQh1g== 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=1743708713; 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=YvJrzkxohOKcEg/7sg5PJo8GIKzMqozntT73W1rgzEU=; b=Wznwyg5KzqsfMmsThXpL5cFY+On5Br/bah1TDv0Idm8AYsjAhO81+rK1Y/oK/OU1g/wnn4 pQLJkMAyBGRGwpLWU74rzQhn4WWot/eCkgLvxYnynreWOm2d1Sn4ZqbOpehdRpllXIYBCa UeAuw/ROK5LmVxrd0SboaMq2/pMUgcFzBMb5HM/fm/KcShBC8xInFI3aYiigGIHmOeVekt SzR7m7bcU9JZzSWowErcALL0BQIZmOSMpx5fNmoGgXMgpRYU7nUebsPl7Q4N1FiiPZhSwJ OAEktjZRrbWUfUAMtXMampdWF20StK6uDpBCkQYI7zeUYtd0nML0EFivPqE3ow== 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 4ZTBgr6K24zLp; Thu, 03 Apr 2025 19:31:52 +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 533JVqpc033820; Thu, 3 Apr 2025 19:31:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JVqQD033817; Thu, 3 Apr 2025 19:31:52 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:31:52 GMT Message-Id: <202504031931.533JVqQD033817@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: d84014ce3aae - stable/14 - MAC/do: parse_rules(): Copy input string on its own 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: d84014ce3aae885af3a7a0a737f38c5d758a830a Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d84014ce3aae885af3a7a0a737f38c5d758a830a commit d84014ce3aae885af3a7a0a737f38c5d758a830a Author: Olivier Certner AuthorDate: 2024-06-28 15:14:30 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:55 +0000 MAC/do: parse_rules(): Copy input string on its own Since all callers have to do it, save them that burden and do it in parse_rules() instead. While here, replace "strlen(x) == 0" with the simpler and more efficient "x[0] == '\0'". Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47591 (cherry picked from commit 2200a3ec711baa98c20a4b65868957dc40912f0f) --- sys/security/mac_do/mac_do.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index e72ffed2ff04..2ddc13d62b4f 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -130,23 +130,26 @@ out: } static int -parse_rules(char *string, struct rulehead *head) +parse_rules(const char *const string, struct rulehead *const head) { struct rule *new; + char *const copy = strdup(string, M_DO); + char *p = copy; char *element; int error = 0; - while ((element = strsep(&string, ",")) != NULL) { - if (strlen(element) == 0) + while ((element = strsep(&p, ",")) != NULL) { + if (element[0] == '\0') continue; error = parse_rule_element(element, &new); - if (error) + if (error != 0) { + toast_rules(head); goto out; + } TAILQ_INSERT_TAIL(head, new, r_entries); } out: - if (error != 0) - toast_rules(head); + free(copy, M_DO); return (error); } @@ -175,7 +178,7 @@ mac_do_rule_find(struct prison *spr, struct prison **prp) static int sysctl_rules(SYSCTL_HANDLER_ARGS) { - char *copy_string, *new_string; + char *new_string; struct rulehead head, saved_head; struct prison *pr; struct mac_do_rule *rules; @@ -196,10 +199,8 @@ sysctl_rules(SYSCTL_HANDLER_ARGS) if (error) goto out; - copy_string = strdup(new_string, M_DO); TAILQ_INIT(&head); - error = parse_rules(copy_string, &head); - free(copy_string, M_DO); + error = parse_rules(new_string, &head); if (error) goto out; TAILQ_INIT(&saved_head); @@ -272,7 +273,7 @@ mac_do_prison_set(void *obj, void *data) struct vfsoptlist *opts = data; struct rulehead head, saved_head; struct mac_do_rule *rules; - char *rules_string, *copy_string; + char *rules_string; int error, jsys, len; error = vfs_copyopt(opts, "mdo", &jsys, sizeof(jsys)); @@ -293,10 +294,8 @@ mac_do_prison_set(void *obj, void *data) mac_do_alloc_prison(pr, &rules); if (rules_string == NULL) break; - copy_string = strdup(rules_string, M_DO); TAILQ_INIT(&head); - error = parse_rules(copy_string, &head); - free(copy_string, M_DO); + error = parse_rules(rules_string, &head); if (error) return (1); TAILQ_INIT(&saved_head);