From nobody Wed Jun 17 03:08:21 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 4gg81x4CG4z6jFLW for ; Wed, 17 Jun 2026 03:08:21 +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 4gg81x2Gp9z3VZ1 for ; Wed, 17 Jun 2026 03:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781665701; 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=UxhEZhJIuvrSAMr74Zc8UpdqTXTrnXwYKbk3Ufm4v90=; b=qgp4lGKL6HIpxiBspRjPleLQOv0itusXYSoFT+smuuyNgqaHeITkJ0WvLPTn9O2WiSCyFL DJGp6LFbKVk7dGk2RXztd+ShNjh2JN9c0xDJwPDHtPMfu5F01AfWd+RyiLFhvLEEMTM8bb hbIVRpmx/1aB0GQU+UQjrmykxHo19ACcHehs6h/dBhzAlX8fyQbezZWitNsAIuqmxCNF0s QeKdlnW1RpMsaloceA2YunAF/5jSGTwMlxdp+oP2Vv0CeaeurTj3QZKbcEcmgKOSCsg/6I JjQ0qWl4IEBvcfGjQDDTLRYYVlq/F3zUL+DcdMFBwo8mgAtwj4jO2DayN4g7Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781665701; a=rsa-sha256; cv=none; b=oE67Cx73qYruKpYct2UGCgI8K6xrzbrqlxvXmDOAHSUTHsowQlysLu4NCO8XBW3d++rHKk JdpMPcUpz0bc4Hy2gUBEiYmxSD649atZJ1kMfEKT+WZedxTto0DUp8zgvNPhxtgZvmNUKd A8LrWCyoDTH6m7S+XhahUa1ncenRZ46MB9wWM7VYsxFAtbcWfZna/6Te1ZzT6qXzLXKaAu hWqTaUGCasLBD9OxrCZIAE7M31/MT875ya7Nw23KpwAwOl0YTvnjqqGJmfqaiuG7l1MG+r 3rvNDKFqybBlJcoPzCq8XhpE6CZvxpFcfF2L5eQhGbJI1Iw8+X8CemUGhPGS2A== 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=1781665701; 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=UxhEZhJIuvrSAMr74Zc8UpdqTXTrnXwYKbk3Ufm4v90=; b=g4REcqxENAMWRC6XQ10To5gAVykHssqAlC34fysn9e2phK8JCr+Vjl1QdRmj714Sp4rHM0 cwcFt5Ie+Wp1sQIiLjcZwxD3hC4BEHMgv8i68xFd4BXRQeu9yGzL51KF1x0InFVdc484ET bA8s74IpIoUXfaVvtKHI5jfmpaMHiCHNDtZ4Y0ObFmNRi2AS9I7W8LMgCEmyvTh2mmElSO Bik7ayXx6Yr8FW2VnSisO4xTqpnAcW8WwiJlds5UqhgiEhORzpArdtwekTakhiUuowjDh5 my4XeQ/WgwRlsBYavMiEPgHczlEM5cfTIiGLM6AfFBeSPuFZsxMH25T+7WRsNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gg81x1byPztc0 for ; Wed, 17 Jun 2026 03:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b184 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Jun 2026 03:08:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6a2c4f0c0d9a - main - acpi: Fix panic when reading 'hw.acpi.suspend_state' knob on S1/S2 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: 6a2c4f0c0d9a9b93b26a1ad76f3a3fcbc590140c Auto-Submitted: auto-generated Date: Wed, 17 Jun 2026 03:08:21 +0000 Message-Id: <6a320fa5.3b184.51e2dd51@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6a2c4f0c0d9a9b93b26a1ad76f3a3fcbc590140c commit 6a2c4f0c0d9a9b93b26a1ad76f3a3fcbc590140c Author: Olivier Certner AuthorDate: 2026-06-03 08:43:27 +0000 Commit: Olivier Certner CommitDate: 2026-06-17 03:06:11 +0000 acpi: Fix panic when reading 'hw.acpi.suspend_state' knob on S1/S2 The 'hw.acpi.suspend_state' sysctl knob was re-introduced with a bug. Its handler, acpi_suspend_state_sysctl(), expects the ACPI softc in 'arg1', but the knob was registered with NULL there. This causes a panic (NULL dereference) when reading the knob if the suspend state has been set to S1 or S2 or equivalently the suspend sleep type to STANDBY. Fix it by passing the ACPI softc as 'arg1' when registering the knob. Reviewed by: obiwac Fixes: 9e1e29bd5ec6 ("acpi: Add back `hw.acpi.suspend_state` sysctl") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57412 --- sys/dev/acpica/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 5cb0afa581ca..107fb64459ce 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -748,7 +748,7 @@ acpi_attach(device_t dev) "your laptop when you close the lid."); SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "suspend_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - NULL, 0, acpi_suspend_state_sysctl, "A", + sc, 0, acpi_suspend_state_sysctl, "A", "Current ACPI suspend state. This sysctl is deprecated; you probably " "want to use kern.power.suspend instead."); SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree),