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 584B5335566; Thu, 28 May 2026 20:13:00 +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=1779999181; cv=none; b=IKkktvpATx7di3o90NouMdAfP3SOLuJsIMPTcYr/4Td3eO3BDSM0kf6SMHqGlIwepw9iPREXExPdTcwGfEuPfmSts442RMzdssVXUCIFwP8wZyRFWl0BjxYNujlws9HmHhufcSIvckDvrDIXH++1nnQ7PwP4kc1VCbsBVDZze1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999181; c=relaxed/simple; bh=ZHf3HEwfymVv++WztcbPZI0IqCTHJ2Fp/e+pqKB24o4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BsJ12XEnYy55KrR0MUaM6o1m5NlSBrF+Tt6ZWLK1sKXrofQ/cNBgPiZ0EznIje87bhZYyHPH7PVEU2Bw/KmERa2dSGlPt8jPU0GVNatyEKN7bgp47qolERshS2ABz8Ak8JNsa472n6UHiECWyYkuTxjHgGFLZ4BAd8t8KdIaRjE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TA/ExAi0; 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="TA/ExAi0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5E651F000E9; Thu, 28 May 2026 20:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999180; bh=tvp3dWrQ4gxvH+zZjNLnnhmODGz858tfxwPcPta9Yak=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TA/ExAi0vUWyv+Gf7MPduDpYUlstp6FqPMbA6iNPXpMruFwrA98fpWNhmXBRCKvJQ pgkcDM1lHIHDabepHq6Wlkmbwcyqm08WMnZT+gZq/mKpaHW9z7rbzhFsjTQx9yOzuL 1B9iooouosx+cR2957H+8wRjxwcJF7nmXseFk1Ls= 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 7.0 390/461] platform/x86: intel-hid: Check ACPI_HANDLE() against NULL Date: Thu, 28 May 2026 21:48:39 +0200 Message-ID: <20260528194658.751020423@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194646.819809818@linuxfoundation.org> References: <20260528194646.819809818@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7.0-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 2ddd8af8c1ce9..085093506dda9 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -688,12 +688,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