From nobody Mon Oct 27 18:27:00 2025 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 4cwMRS45flz6FGyW; Mon, 27 Oct 2025 18:27:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwMRS3Js2z3Dlj; Mon, 27 Oct 2025 18:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761589620; 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=HILrL41GHANUgDhFCqKti10LwpqkVCVLw7JJUSP9N0s=; b=w9UwqUYmhzGFPvYx6rtGeDt+OdIi9VQFhRdpzLMticb5+wws0aQkorvcsE00/5wpxjxJDv kQxN8XDeMJ+BzxuLfGbN9p5Day3F2L8w8ognIztoNyuOiPIO7mib10pbsqOXnsf6OXTbQ1 emue0hjSbvjOhtRBRMFo55KMXQQ5JBrRnLqVjclcSGuPcUzknx2W1HgLZqVet7ekUZ/Yfq +CBgSVbdikcC5gai6DdbLX+yRe/ucBIU0gxw5qqqqL6gv2+BH3CYFk6Gc2kmbpBh5LVfNK zgd7d2IeLRK1if1Z56/3C4vgtD8C+Lzuubzy/3/z2bCeQ3WS+EnnFiv1gknIRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761589620; 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=HILrL41GHANUgDhFCqKti10LwpqkVCVLw7JJUSP9N0s=; b=EoJipGG1Va+Eo09+w0HYrneCrp3SQmIWR2Mg+Q9z5MwEvSRoZXGSVYkzgSVLh43uBl4RrW nHr+5ciZzN5m0IRXKZ7NqLiE7iWp2wfeEbiCQUXvhLxeHXnfFGozYOh23i0qQ0hcorNpA4 5CTJgXtm/7AGSRKLs3Nf3aCCA9D3eWDYlzwtWB7hxeqRvSVkc7yZ6isGt5bQ0VqwcG2JEI pvQbHOcUWf/45nR0vITig3ftjdh7z9D/wu+BNhOECHDTDRHy8fSmf1LI0CDcOF9wEbeUxg e/+COuDw1nCclZkef/DqU8tjB9F+ZCvNnF0VEGWLQCWK4RKrEGQj+SarESuWuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761589620; a=rsa-sha256; cv=none; b=Fcht3QuKZnqYqq9tKmf2NW7KuTJqK353VrcxG3haVau/f9MP2desr+KiussR83d5agVuW6 +EAzBfcBMYurJPj/Jai8eiZynwO9ZHUF+sg8I6l7ZMRU5sQSg/njVc7a/tAUaRZAQHhjxe aTeKbopAPlCWzIS2D/4yx2hnDNfdm2k9GOztu5+atq+5Cc660SxDx8ZnNX0JFRmd/6aYN3 VXNuaCg7bcMLe4tr/3O554Ofq1h65XVlJ+SJgCZhaFbilM90Aot9aC1/mEVgIzU2Q2kEQr DCNuBOcFlatubyFL0C0nx7v8GUvoT4zoFafkp75B93dRXRjoJKN3DRnofQOrCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwMRS2rwpzbR; Mon, 27 Oct 2025 18:27:00 +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 59RIR01g027013; Mon, 27 Oct 2025 18:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RIR0mG027010; Mon, 27 Oct 2025 18:27:00 GMT (envelope-from git) Date: Mon, 27 Oct 2025 18:27:00 GMT Message-Id: <202510271827.59RIR0mG027010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 34dfccc64f47 - main - acpi: in acpi_stype_sysctl() use same logic as in acpi_sleep_state_sysctl() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34dfccc64f47f1549e65593b4a3aa8d31757529d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=34dfccc64f47f1549e65593b4a3aa8d31757529d commit 34dfccc64f47f1549e65593b4a3aa8d31757529d Author: Gleb Smirnoff AuthorDate: 2025-10-27 18:22:46 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-27 18:26:32 +0000 acpi: in acpi_stype_sysctl() use same logic as in acpi_sleep_state_sysctl() Otherwise we allow to trigger an MPASS() by a userland sysctl, e.g. hw.acpi.power_button_state=NONE. This does not bring fully compatibility, where as before 97d152698f483 setting to 'NONE' actually meant disabling any action on a power or sleep button. Now sysctl will fail, but with this change it won't at least panic. Aymeric may come with a better fix. Fixes: 97d152698f4831db5a94d55c15233330c188feda --- sys/dev/acpica/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 3f0a7b40245d..e3ff4f6937d2 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4430,8 +4430,8 @@ acpi_stype_sysctl(SYSCTL_HANDLER_ARGS) return (EINVAL); printf("warning: this sysctl expects a sleep type, but an ACPI S-state has " "been passed to it. This functionality is deprecated; see acpi(4).\n"); - MPASS(sstate < ACPI_S_STATE_COUNT); - if (acpi_supported_sstates[sstate] == false) + if (sstate < ACPI_S_STATE_COUNT && + !acpi_supported_sstates[sstate]) return (EOPNOTSUPP); new_stype = acpi_sstate_to_stype(sstate); }