From nobody Mon Jun 29 19:25:49 2026 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 4gpx8G2hYCz6jjWr for ; Mon, 29 Jun 2026 19:25: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpx8G0ZJpz40WR for ; Mon, 29 Jun 2026 19:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782761150; 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=n6EPE4e7WpwBot8yb6ahguVSp/m01i+4nyVSIOPyA4c=; b=UI/VhH931sGTMHKhQ3m4AQ3Mr0hUqJyIXSPMtU4FvinPFuaIafCDAzh/E11OL72ADbrt4B 0J/bcbpVTI6ysBciqxV+nzlWq80QICIqhYK/l/KjpjrmJMFfF8lrAcoIxyJY/b4lhSiqG9 WyJIh+dJfLHzGf1AwH5OrK9n22xVy1gXHKq/7I4Ywvr+rJFzAqKnhpPjqWOO20jOTPedMF WGeGJr0TUjbno74NwonnGxKTHgbCzZdxpz/5X40vMhLlDBi0RzRxxeBfqWK/qyPVpaaJtc ixTXR/U9tz+s109pykd03hEdnfUa+v+R1ZigyXTD5cAvTdVf3y/F6T4vxofZsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782761150; a=rsa-sha256; cv=none; b=BInkPfs1RLbC3eZTnCo3a/QXuhKvag1+imgJ3fa7H3NFmZ/9/eAXA7t1D3svlRKRKrfcfI fion9Jr5RyW2J9VApR1Fg1iPBY7mOkJdbr+NmbSGhNGJfO7kA3nKkiR9QGF7LNyfVrmuWd AcpXoqx+v6iz5dOenEKwaaK5GTqeRM3slVExFqAZr4eadX62fwwGOVvH9iG9gFv5wStAfZ jWaz9Sg3bQj2hF9NkEiPQyWZfFP5yWpwSamo8JqIXhIKvmiDfRB/A6bu9nFUMnij4bDZQm Fg9fduugAK8E5ScJw4fxIsvsKjhqEEgzP22tLBFAIu6FRqadi3FdZEdgtrfaGw== 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=1782761150; 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=n6EPE4e7WpwBot8yb6ahguVSp/m01i+4nyVSIOPyA4c=; b=IXgfLbM/VTQOIoVHSNUsphM/ekloD/mxOSWIfASGfwu8XaN6F0eKgzHJxvkx0r5j1AWyuy bCAaIZWPVyU/saxPtP6aRhQU1M/9nmdgN3VmK0FErgdK6oGD1HwTwvuGldKG3qVFrlkSPf sM1awXXlE+O2Qs7CyCQdZJZ+npGEHHZQA4lyNnl7OcOiYTzOgLwQm5ld18YCXL6fgEYD2u ue3rxZzIe0xsQY3vatIO24n2X5VvAYvnXGobykjoKmXOwmqIg02jSCEgFCe1TEUEbB+RSW KX7Il/zXcYngoGhZVSD8SuzN+SdXOuxbwOsd82BFlwDuJXVJZwXQ9DED4TsSxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpx8F6mP6z19fm for ; Mon, 29 Jun 2026 19:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 19:25:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: bef2b6e3bf4a - stable/15 - MAC/do: clone_rules(): Readability improvements, constification 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: bef2b6e3bf4a8e615438c4f90472fd70309a407c Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 19:25:49 +0000 Message-Id: <6a42c6bd.21e84.3e7edf98@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bef2b6e3bf4a8e615438c4f90472fd70309a407c commit bef2b6e3bf4a8e615438c4f90472fd70309a407c Author: Olivier Certner AuthorDate: 2026-05-20 10:33:41 +0000 Commit: Olivier Certner CommitDate: 2026-06-29 19:23:46 +0000 MAC/do: clone_rules(): Readability improvements, constification Constify in order to let the compiler check that source and destination arguments are passed in the proper order in the different calls. No functional change (intended). Reviewed by: bapt MFC after: 1 month Sponsored by: The FreeBSD Foundation Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/38 (cherry picked from commit ce59a4181593f59028d3a26f2b63dcf2c8041d79) --- sys/security/mac_do/mac_do.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index f23509f6bebe..7b9c45eb265b 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1372,27 +1372,29 @@ set_default_conf(struct prison *const pr) static void clone_rules(struct rules *const dst, const struct rules *const src) { - struct rule *src_rule, *dst_rule; + const struct rule *src_rule; strlcpy(dst->string, src->string, sizeof(dst->string)); STAILQ_FOREACH(src_rule, &src->head, r_entries) { - dst_rule = malloc(sizeof(*dst_rule), M_MAC_DO, M_WAITOK | - M_ZERO); + struct rule *const dst_rule = malloc(sizeof(*dst_rule), + M_MAC_DO, M_WAITOK); bcopy(src_rule, dst_rule, sizeof(*dst_rule)); if (src_rule->uids_nb > 0) { - dst_rule->uids = malloc(sizeof(*dst_rule->uids) * - src_rule->uids_nb, M_MAC_DO, M_WAITOK); - bcopy(src_rule->uids, dst_rule->uids, - sizeof(*dst_rule->uids) * src_rule->uids_nb); + const size_t uids_size = sizeof(*dst_rule->uids) * + src_rule->uids_nb; + + dst_rule->uids = malloc(uids_size, M_MAC_DO, M_WAITOK); + bcopy(src_rule->uids, dst_rule->uids, uids_size); } if (src_rule->gids_nb > 0) { - dst_rule->gids = malloc(sizeof(*dst_rule->gids) * - src_rule->gids_nb, M_MAC_DO, M_WAITOK); - bcopy(src_rule->gids, dst_rule->gids, - sizeof(*dst_rule->gids) * src_rule->gids_nb); + const size_t gids_size = sizeof(*dst_rule->gids) * + src_rule->gids_nb; + + dst_rule->gids = malloc(gids_size, M_MAC_DO, M_WAITOK); + bcopy(src_rule->gids, dst_rule->gids, gids_size); } STAILQ_INSERT_TAIL(&dst->head, dst_rule, r_entries);