From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64F7E2E7379; Thu, 28 May 2026 20:29:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000188; cv=none; b=J6997X7R3Ci30Xc86ys1fYYWcudQVIrNBgkloB9JH4yHNRNF0AR57bJQxO6To67QtZpdCzT7QUqahH7AHG0VWV25Dm6yIrWK0N0a8nBAV19tT6aPaHwANe5pMZzJkWR3MGKQ1R3adsRZL+D0xSGqv8FU60NxSOcyW3bfnL41//Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000188; c=relaxed/simple; bh=XBlsluu7Qgr6xD6RA/o3VWdGtz77994/h5WMfXZqTFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CwiFaAz1Mmg4GwtADUjJQeJOpAnur/Mwv4rMjMDDp0JAx61FqXEGaqCql0ODb3Tzl/qjJDFE+e8f1OS7OVbl98/IYnMnz2uqjFdFI1qkC61mxvWjwtcqUPS3iQmXFtwXuPGAyh4NK5sCc3EzHiqAm38Fh5Vmw81DofotrG6tLzM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fzchRxPx; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fzchRxPx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1FEB1F000E9; Thu, 28 May 2026 20:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000187; bh=9PAyPaXYRlTd1skBwP+oZhzETQrE195YOq2MNiKaaBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fzchRxPxJrjUK8g2ajRpLoD9fwQo70oqG8HpKwrRftVFIUZPvLTo+nX1jZRk7pTQE s8A4B7likSnC29/zT5p25rcpCMlDOVpJQXLsprEq3CZii5dSzf+Tx4maih97s+EC0B wv5HyL+ZqCvcAzJfS0IJ/TaMS/RG0xFAeZc0f20Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Rafael J. Wysocki" , Andy Shevchenko , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.18 333/377] platform/x86: intel-hid: Check ACPI_HANDLE() against NULL Date: Thu, 28 May 2026 21:49:31 +0200 Message-ID: <20260528194648.056597229@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit 5c69e090ae5dd93d910f70db0796357080707d26 ] Every platform driver can be forced to match a device that doesn't match its list of device IDs because of device_match_driver_override(), so platform drivers that rely on the existence of a device's ACPI companion object need to verify its presence. Accordingly, add a requisite ACPI_HANDLE() check against NULL to the platform/x86 intel-hid driver. Fixes: ecc83e52b28c ("intel-hid: new hid event driver for hotkeys") Signed-off-by: Rafael J. Wysocki Reviewed-by: Andy Shevchenko Link: https://patch.msgid.link/1971512.tdWV9SEqCh@rafael.j.wysocki Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/x86/intel/hid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c index c5e80887d0cb0..f7e358be1af3a 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -682,12 +682,16 @@ static bool button_array_present(struct platform_device *device) static int intel_hid_probe(struct platform_device *device) { - acpi_handle handle = ACPI_HANDLE(&device->dev); unsigned long long mode, dummy; struct intel_hid_priv *priv; + acpi_handle handle; acpi_status status; int err; + handle = ACPI_HANDLE(&device->dev); + if (!handle) + return -ENODEV; + intel_hid_init_dsm(handle); if (!intel_hid_evaluate_method(handle, INTEL_HID_DSM_HDMM_FN, &mode)) { -- 2.53.0