From nobody Fri Apr 24 15:29:00 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 4g2H1S5dcYz6bSRC for ; Fri, 24 Apr 2026 15:29: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H1S2svxz3CwT for ; Fri, 24 Apr 2026 15:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044540; 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=rtpcWnFgbo9inSMGWOTG0FkLECJiOCcLalBEKXkaDcc=; b=tSIAndlNw3cqLuxsHIINKGDGhvyDoQ/PQu4lzw9ZGYMC8y56W7dMUJfm1TZX6eGMqbm6x2 Tpa/YuMmCiMBc5u/jk1VOgEFyWPZSHX6N9L2X++G5G0CA4MNNBip+NSGwOAyu14aGnQzbt SavQPo4YBRzmyDmkUW118IEud5PLHonD6rvcgD/tWjEkax6ABKu8MJptbXrU6n3fEphguR Rglr7SkQAlP3wwMtcEaSQG8xK1VkTHwSaahd7lcEaXbq0qlxkPYlt6lBycQWR4Z48hm5Zm gMsxZyBrZ8ErFT+O0GrZ+bWR8jBR//OoLpzlryDPkN5uv7n3HgFmNdZH45bGCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044540; a=rsa-sha256; cv=none; b=QKIZzJ8k+Ct6a/v3Ce+DYqmkyfASBg4JnDt2NV6B890a551uPXY8XajAg+lh0Qi8dlP3Mk D9cEHEMtnp+pKrDCCggOzkYqDSbR8ZqhZH8p3OIqTuzp3jIhXt9FRRwA9itfsIAhQZBXy/ J4FfEQJy4B6CGQ9gepDfZauxk5HA/BgYx9Ou1aqoiE0D/KDuZ/oA04kmgfr4yrE6qrHJ9/ aZjyBPZoz299TjnsFu4//GesnGQl8gqAUc0+tjs13MXd+XynYeayQGgI89OHwdbNaAH4Ec RHWG4mW4knRmezAMOMKycDsELVqR+1AZKJnvCfVXYZsAwKdmMTVQe7/2kKXc6Q== 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=1777044540; 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=rtpcWnFgbo9inSMGWOTG0FkLECJiOCcLalBEKXkaDcc=; b=X/k6Lm30ogYHVF8l2NziVNUFhQsPLDPdfGXD9EcFKB8F7RpyISiUKXSs7McKmtQ3CcBbQZ fE/msCtomXrckgqvOZyaGd4aqaenmy9s1ZJQoXvlsbPYNQm9FpTGx4A43mC97F8jNLUTJy xZwlgMLd6D54WjV6K/PYgkl1MZIYqtozsts7gAvha+Xk4P4SS7oafnjMPmxluC7Wtcdfdi iy4J23dQfkDkF9eYq4NHj8sDiFdWwZhTwKWyLoUPExDJs87c9sC1ANlS1RQkggLdBRARd5 Gt5U97xEabvfqU8i3Bz4Dh0zxxBKMw6t2pCbVNY5WNzB40rQDPR4+g7JHVteqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1S2RMlz173C for ; Fri, 24 Apr 2026 15:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ef3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 03792b24472f - stable/15 - acpi: Reject duplicate handlers for ioctl commands 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 03792b24472f6dc3a043007c7eef455291737889 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:00 +0000 Message-Id: <69eb8c3c.33ef3.62d53012@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=03792b24472f6dc3a043007c7eef455291737889 commit 03792b24472f6dc3a043007c7eef455291737889 Author: John Baldwin AuthorDate: 2025-12-26 15:36:38 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:38 +0000 acpi: Reject duplicate handlers for ioctl commands Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54311 (cherry picked from commit 4eb560faa725771e536a850a9467fbb592ab3c1b) --- sys/dev/acpica/acpi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index bac5b8c889e0..47c8ae1d1d6b 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4109,7 +4109,7 @@ static int acpi_ioctl_hooks_initted; int acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) { - struct acpi_ioctl_hook *hp; + struct acpi_ioctl_hook *hp, *thp; if ((hp = malloc(sizeof(*hp), M_ACPIDEV, M_NOWAIT)) == NULL) return (ENOMEM); @@ -4122,6 +4122,14 @@ acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) TAILQ_INIT(&acpi_ioctl_hooks); acpi_ioctl_hooks_initted = 1; } + TAILQ_FOREACH(thp, &acpi_ioctl_hooks, link) { + if (thp->cmd == cmd) { + ACPI_UNLOCK(acpi); + free(hp, M_ACPIDEV); + return (EBUSY); + } + } + TAILQ_INSERT_TAIL(&acpi_ioctl_hooks, hp, link); ACPI_UNLOCK(acpi);