diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2024-11-09 23:00:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-14 20:03:37 +0100 |
| commit | e173bce05f7032a8b4964cfef82a4b7668f5f3af (patch) | |
| tree | 3a3cf525f2751079384a56e6ea35a0f94878b64d /drivers/acpi | |
| parent | 342d91f67051f29b634ff2c93ca10f431367b968 (diff) | |
| download | linux-e173bce05f7032a8b4964cfef82a4b7668f5f3af.tar.gz linux-e173bce05f7032a8b4964cfef82a4b7668f5f3af.tar.bz2 linux-e173bce05f7032a8b4964cfef82a4b7668f5f3af.zip | |
ACPI: x86: Add adev NULL check to acpi_quirk_skip_serdev_enumeration()
[ Upstream commit 4a49194f587a62d972b602e3e1a2c3cfe6567966 ]
acpi_dev_hid_match() does not check for adev == NULL, dereferencing
it unconditional.
Add a check for adev being NULL before calling acpi_dev_hid_match().
At the moment acpi_quirk_skip_serdev_enumeration() is never called with
a controller_parent without an ACPI companion, but better safe than sorry.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patch.msgid.link/20241109220028.83047-1-hdegoede@redhat.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/x86/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c index 3eec889d4f5f..423565c31d5e 100644 --- a/drivers/acpi/x86/utils.c +++ b/drivers/acpi/x86/utils.c @@ -536,7 +536,7 @@ int acpi_quirk_skip_serdev_enumeration(struct device *controller_parent, bool *s * Set skip to true so that the tty core creates a serdev ctrl device. * The backlight driver will manually create the serdev client device. */ - if (acpi_dev_hid_match(adev, "DELL0501")) { + if (adev && acpi_dev_hid_match(adev, "DELL0501")) { *skip = true; /* * Create a platform dev for dell-uart-backlight to bind to. |