diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-10 09:08:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-10 09:08:22 -0700 |
| commit | a19ea421490dcc45c9f78145bb2703ac5d373b28 (patch) | |
| tree | 188fba66c9597d5be2da740b5fd50fb027c2412e /drivers | |
| parent | 97488b92e5172e7a1525cf04b6ed95c404add06f (diff) | |
| parent | b6e02c6b0377d4339986e07aeb696c632cd392aa (diff) | |
| download | lwn-a19ea421490dcc45c9f78145bb2703ac5d373b28.tar.gz lwn-a19ea421490dcc45c9f78145bb2703ac5d373b28.zip | |
Merge tag 'platform-drivers-x86-v6.10-6' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver fix from Hans de Goede:
"One-liner fix for a dmi_system_id array in the toshiba_acpi driver not
being terminated properly.
Something which somehow has escaped detection since being introduced
in 2022 until now"
* tag 'platform-drivers-x86-v6.10-6' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
platform/x86: toshiba_acpi: Fix array out-of-bounds access
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 10d0ce6c8342..78a5aac2dcfd 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -3299,6 +3299,7 @@ static const struct dmi_system_id toshiba_dmi_quirks[] __initconst = { }, .driver_data = (void *)(QUIRK_TURN_ON_PANEL_ON_RESUME | QUIRK_HCI_HOTKEY_QUICKSTART), }, + { } }; static int toshiba_acpi_add(struct acpi_device *acpi_dev) |