[PATCH] drivers/platform: toshiba_acpi: Fix array out-of-bounds access

[PATCH] drivers/platform: toshiba_acpi: Fix array out-of-bounds access

[Armin Wolf]

In order to use toshiba_dmi_quirks[] together with the standard DMI
matching functions, it must be terminated by a empty entry.

Since this entry is missing, an array out-of-bounds access occurs
every time the quirk list is processed.

Fix this by adding the terminating empty entry.

Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202407091536.8b116b3d-lkp@intel.com
Fixes: 3cb1f40dfdc3 ("drivers/platform: toshiba_acpi: Call HCI_PANEL_POWER_ON on resume on some models")
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
 drivers/platform/x86/toshiba_acpi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 3a8d8df89186..d54bccec6ad6 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[] = {
 		},
 	 .driver_data = (void *)(QUIRK_TURN_ON_PANEL_ON_RESUME | QUIRK_HCI_HOTKEY_QUICKSTART),
 	},
+	{ }
 };

 static int toshiba_acpi_add(struct acpi_device *acpi_dev)
--
2.39.2

Re: [PATCH] drivers/platform: toshiba_acpi: Fix array out-of-bounds access

[Hans de Goede]

Hi,

On 7/9/24 4:38 PM, Armin Wolf wrote:
> In order to use toshiba_dmi_quirks[] together with the standard DMI
> matching functions, it must be terminated by a empty entry.
> 
> Since this entry is missing, an array out-of-bounds access occurs
> every time the quirk list is processed.
> 
> Fix this by adding the terminating empty entry.
> 
> Reported-by: kernel test robot <oliver.sang@intel.com>
> Closes: https://lore.kernel.org/oe-lkp/202407091536.8b116b3d-lkp@intel.com
> Fixes: 3cb1f40dfdc3 ("drivers/platform: toshiba_acpi: Call HCI_PANEL_POWER_ON on resume on some models")
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>

Thank you for your patch.

I have included this patch in the fixes pull-req to Linus
which I have just send out.

Regards,

Hans







> ---
>  drivers/platform/x86/toshiba_acpi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
> index 3a8d8df89186..d54bccec6ad6 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[] = {
>  		},
>  	 .driver_data = (void *)(QUIRK_TURN_ON_PANEL_ON_RESUME | QUIRK_HCI_HOTKEY_QUICKSTART),
>  	},
> +	{ }
>  };
> 
>  static int toshiba_acpi_add(struct acpi_device *acpi_dev)
> --
> 2.39.2
>