From nobody Fri May 22 10:03:45 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 4gMLTF2qSJz6fLnh for ; Fri, 22 May 2026 10:03:45 +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 4gMLTF2JG1z3k6x for ; Fri, 22 May 2026 10:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779444225; 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=uWJLMwxddJtBnZmcuKdcZKTy/pfZaKHsMxlluOq22HE=; b=ysHOgnaupPkPszGtZwALD3JuethPD9J+nrxX+0R6yB8EFAokvUe8CKRlvCV6nLPJuuFwaZ uvZ7VZsLJeOUMMrEYpH2jbFN/v3xMrSaMVrBxE6UofvLLbDfKxOkSdxZ/QuSIpO+j84CUs qgotbIHzFUTtDBOKIONsuQechmwNV03YNdIusbuLGqcbUsLkeEqGsC3YZ8sdNeJ9pVdw6U J/ES68IPOcYpFoIzSsNUJbmUn65ZNY8yyOrfhPNK29ovrBAcs9ViT2arQkAebg4uYw5J60 79V+SUEVCYvbZNj98Z8PTiBc6VS5qbyEj8wh18uI81FOQ0WV2EyxGX13sJVQ1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779444225; a=rsa-sha256; cv=none; b=Qccglhn8m/1vmd2UweQSWZE+bgLxZD3moMhT50LU6GRrNjK1CgcqtC1wJuL6niTLhwwpiB DwKSvjMnMyy6Sx11eP+1IFpwrTn+g8o3oqiyp8816U5rnX2oN/haGVw5o9z96MVj7+BANv OvEz9zkwcrr4oln8/CSpCOZMv4E1ni5xOra9OHc1CUkj5TgBRjC4iEkRLo1GM6c3LkJ2ZS ikJpEUAgNXrx9+b8Hl6NdkKIZyxQOl1rys5gRowhnjkRCsy0aXu5iTBGNer9fu5kg0a7n3 SoGGv4rCcAkYwUutzryZbNIWPzMuLM/MKp2rlceIY5QspgirDfFlGyvBbP50oA== 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=1779444225; 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=uWJLMwxddJtBnZmcuKdcZKTy/pfZaKHsMxlluOq22HE=; b=ofyi3fqwMUbqnpGMO8HeqvtZdkvXH4Zq8jEeDeiFaJrGazuy1uLGpXTQfs8QG8Ktm7B6iR hBiCpx4fcSaVIvnnJeVPtLaV/+As79UnlHaxf1gD4ZUUEreyhu/7Yan7Oge6w5PkctSyNC AgqN+gBo2xuT1Fi2GkWvzzjkhNfqGyfz0/qvaU2GthZ3vtyzadMi2eqrCBrxMwiZT93B7Q UvagHbFgxfvp4h3TTuKSRpjDnlrWRnzvePWkipe7iVMn86iMbRrY4wSbaHKhHCSyOx2Ahb NzcBAb5nOuMykTw0D1bZGUlK+jMa8+n+ULU6x78RdnFAZS/ERLPnxWyrbk9A2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMLTF1vNgz1BT for ; Fri, 22 May 2026 10:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ebd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 22 May 2026 10:03:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: f814650aaf78 - main - power: Fix stype name lengths 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f814650aaf788323b3d485d96996fce6cd7b2d7f Auto-Submitted: auto-generated Date: Fri, 22 May 2026 10:03:45 +0000 Message-Id: <6a102a01.1ebd3.138af078@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=f814650aaf788323b3d485d96996fce6cd7b2d7f commit f814650aaf788323b3d485d96996fce6cd7b2d7f Author: Aymeric Wibo AuthorDate: 2026-05-22 09:58:57 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-22 10:01:07 +0000 power: Fix stype name lengths When updating the names of the sleep types in 95b4436e989d ("power: Rename sleep types"), I forgot to update the lengths of the buffers they went into. Reported by: mhorne Fixes: 95b4436e989d ("power: Rename sleep types") Sponsored by: The FreeBSD Foundation --- sys/dev/acpica/acpi.c | 2 +- sys/kern/subr_power.c | 2 +- sys/sys/power.h | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index ec1f002150c1..8be94db73729 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4609,7 +4609,7 @@ acpi_sleep_state_sysctl(SYSCTL_HANDLER_ARGS) static int acpi_stype_sysctl(SYSCTL_HANDLER_ARGS) { - char name[10]; + char name[POWER_STYPE_NAME_LEN]; int err; int sstate; enum power_stype new_stype, old_stype; diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index ffd91db83e96..1cfa6e5c77dd 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -145,7 +145,7 @@ sysctl_supported_stypes(SYSCTL_HANDLER_ARGS) static int power_sysctl_stype(SYSCTL_HANDLER_ARGS) { - char name[10]; + char name[POWER_STYPE_NAME_LEN]; int err; enum power_stype new_stype, old_stype; diff --git a/sys/sys/power.h b/sys/sys/power.h index a1497d1a6524..b2d49781d359 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -85,7 +85,10 @@ enum power_stype { POWER_STYPE_UNKNOWN, }; -static const char * const power_stype_names[POWER_STYPE_COUNT] = { +/* XXX NUL terminator is included in this number */ +#define POWER_STYPE_NAME_LEN 16 + +static const char power_stype_names[POWER_STYPE_COUNT][POWER_STYPE_NAME_LEN] = { [POWER_STYPE_AWAKE] = "awake", [POWER_STYPE_STANDBY] = "standby", [POWER_STYPE_FW_SUSPEND] = "fw_suspend",