From nobody Fri May 29 16:01:43 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 4gRp5373sNz6fl7r for ; Fri, 29 May 2026 16:01:43 +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 4gRp532zpFz3Hdt for ; Fri, 29 May 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780070503; 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=d1fRAtUftT22uAmxat0XUe+AqZAgw8TyJa8vQ1BsKYg=; b=kXRBykQCdDr/KRA+DcV5AilIPB3hgBxDWqq5WqexkoNBCXniQWuvzk6j6+EKxKd+Cbb+8s YviTPmDjuL32vhWcwY5N7ZUuDi0Trcu+Sh1oBRtiPgURw6SFSnn39mkTh0pc/2bK5n+D3g F9gLU1Uw7LzdeK5D5GpWCH1Jz7DG4Tqw24shMdIE2aOZ9KHPSxLaVx51s7wGXk2+XX6Mm8 Ipe6KFpUuwd3DHhz3Efe4jOg7unLK6qjDg5q4rWEMZTpyFZCVyWkRJhnYQQveZYXrRugjF mY3+UnhVi8CCmBLuaEmAWIR9rkJ4x0rU6S/lEOBBfiTRBtCY+ROO3hUe/+SCNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780070503; a=rsa-sha256; cv=none; b=m8G/ygmn1mH5ySTt1fPMvPIuTtVTzkHDk4yFqt9JJRbmcFLyfvnfyYDPoi6NmYq+Bl+HmX 5jkILjKLKVzmVs61xyafvJEuz3OOggxWJdJDEl7R674XkOYYiPN5bVCE/6kl0YN/jv6uwP CYTM7I9tx8gu7m5njnrPEPZRChiJy/vLwfFiliu7aM7jkRw2Ya+9KACyHc1UCAWG0EMfg0 zx0XbFekDLUZungQ4lZqdcY5zS9wB/uZWkbZLY0jqH+vR+r0cPa760J2yF1FLRX70P6Nh0 oJA+rKVXYBon03tBUinSuaM1J8VHCtfCwICj/RWOSFXzmfjntlvSEAP3Y83sCg== 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=1780070503; 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=d1fRAtUftT22uAmxat0XUe+AqZAgw8TyJa8vQ1BsKYg=; b=YdnXZlr1adxLt9XEvGdbsUgVC81v/Ixm6+Sy3UutSc0JC1xZUCfUgfUB4S8gA1/3ifpUS3 Da3Aga5oxTQKRZ9XkMp7KmpAE9wVm5ueKeuyB3TbeOosZIDQvhpizRFNNQSwvsngRuhykU pBZwcAsC5vtw71zXCF/pEJswoyPfC1hjwAQJIaTWpYB8ZNKixwQEGlVRjAeu4L3pGW8NHQ E/xuBAsBzk75IZeXwBgNvkCz5gTbxnp2dPz2MMQdnkiB6oS4J2IlUxgyrBZ9IE4Ou+ud4H wxtq/WCe4pSKu7AYatfjnEfTTsJmBRYxhtGESjtvreYeTjSWgC4KAsLisB7RXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRp531zzyzgmy for ; Fri, 29 May 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36088 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 16:01:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ce59a4181593 - main - MAC/do: clone_rules(): Readability improvements, constification 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: ce59a4181593f59028d3a26f2b63dcf2c8041d79 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 16:01:43 +0000 Message-Id: <6a19b867.36088.150fa440@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ce59a4181593f59028d3a26f2b63dcf2c8041d79 commit ce59a4181593f59028d3a26f2b63dcf2c8041d79 Author: Olivier Certner AuthorDate: 2026-05-20 10:33:41 +0000 Commit: Olivier Certner CommitDate: 2026-05-29 15:23:04 +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 --- 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 fa20beadbaad..b24daaf093c0 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1370,27 +1370,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);