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 72C92233D9E; Sat, 30 May 2026 18:19:19 +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=1780165160; cv=none; b=cskQTQ/0lSIT9tk/U9Fyye7ASg+G2bZv3G2szM7rdobSb/EN8u5LemjKbos8hiDHUYnO3ZlO2gxeodQJ0OKsoGzEkOfs6lU91hszF0rv/pR6lKAsITLjDNUot3L4+1/5OgbboV5gcfcw4yeR4v++CF0rxwBsqfuv9QB2ACFW5SU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780165160; c=relaxed/simple; bh=flN0Fy6w2PKR925sLwN12oyTXwkUvxXZ8o4ztFbEQj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GJ5Y7c7GTKB/8mMvZ4eErObqtLupeWOfLDuDfr5ocIbYotrzAdqomXG8YRYOiZKOCZHXeeKv2vxUExdr3twZwG/MNVnQrfN7seXxHepbrapQ4F0uTRmrYyfX/n5vGWN6FpmW4OJ3lEdYYgIMPK6uL8bM/ZTCKVvBFfU6UyoAl18= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zlNLPgzF; 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="zlNLPgzF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95A461F00893; Sat, 30 May 2026 18:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780165159; bh=xtY7+pJ54HN/D9NDaOKVSOuUDt4VUadunGx/apicezA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zlNLPgzFukV2iiLWSv9BxPErQATOhFX0PuUlMoWulMjomoJeMEVWee7q9DWCj95Ui 3peanaR3Z+iFFsUHLfvmsjqsWRodgUOsXoAjad0dzyeGdZj44B28muR5vBHg8ooXzJ KWgd2zjH5mhnLksK62o38zQjeO8YGf4rGSnRHzeA= 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 5.15 767/776] platform/x86: intel-vbtn: Check ACPI_HANDLE() against NULL Date: Sat, 30 May 2026 18:08:01 +0200 Message-ID: <20260530160259.547696022@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160240.228940103@linuxfoundation.org> References: <20260530160240.228940103@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit a9f305c5a355efeb240d406d378491d9eec02d07 ] 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-vbtn driver. Fixes: 26173179fae1 ("platform/x86: intel-vbtn: Eval VBDL after registering our notifier") Signed-off-by: Rafael J. Wysocki Reviewed-by: Andy Shevchenko Link: https://patch.msgid.link/3426431.aeNJFYEL58@rafael.j.wysocki Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/x86/intel/vbtn.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel/vbtn.c index 4e9d3f25c35d0..0906530b2bad4 100644 --- a/drivers/platform/x86/intel/vbtn.c +++ b/drivers/platform/x86/intel/vbtn.c @@ -272,12 +272,16 @@ static bool intel_vbtn_has_switches(acpi_handle handle, bool dual_accel) static int intel_vbtn_probe(struct platform_device *device) { - acpi_handle handle = ACPI_HANDLE(&device->dev); bool dual_accel, has_buttons, has_switches; struct intel_vbtn_priv *priv; + acpi_handle handle; acpi_status status; int err; + handle = ACPI_HANDLE(&device->dev); + if (!handle) + return -ENODEV; + dual_accel = dual_accel_detect(); has_buttons = acpi_has_method(handle, "VBDL"); has_switches = intel_vbtn_has_switches(handle, dual_accel); -- 2.53.0