lkml.org 
[lkml]   [2019]   [Dec]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] platform/x86: huawei-wmi: Fix a possible NULL deref
Please ignore this patch I'll be sending another one. guid->guid_string
is always true.

On 19/12/25 06:58PM, Ayman Bagabas wrote:
> We're iterating over a NULL terminated array.
>
> Fixes: 1ac9abeb2e5b ("platform/x86: huawei-wmi: Move to platform driver")
> Signed-off-by: Ayman Bagabas <ayman.bagabas@gmail.com>
> ---
> drivers/platform/x86/huawei-wmi.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
> index a2d846c4a7ee..42d461eeeff4 100644
> --- a/drivers/platform/x86/huawei-wmi.c
> +++ b/drivers/platform/x86/huawei-wmi.c
> @@ -784,13 +784,13 @@ static const struct wmi_device_id huawei_wmi_events_id_table[] = {
> static int huawei_wmi_probe(struct platform_device *pdev)
> {
> const struct wmi_device_id *guid = huawei_wmi_events_id_table;
> + struct input_dev *idev = *huawei_wmi->idev;
> int err;
>
> platform_set_drvdata(pdev, huawei_wmi);
> huawei_wmi->dev = &pdev->dev;
>
> - while (*guid->guid_string) {
> - struct input_dev *idev = *huawei_wmi->idev;
> + while (guid->guid_string) {
>
> if (wmi_has_guid(guid->guid_string)) {
> err = huawei_wmi_input_setup(&pdev->dev, guid->guid_string, &idev);
> @@ -820,7 +820,7 @@ static int huawei_wmi_remove(struct platform_device *pdev)
> {
> const struct wmi_device_id *guid = huawei_wmi_events_id_table;
>
> - while (*guid->guid_string) {
> + while (guid->guid_string) {
> if (wmi_has_guid(guid->guid_string))
> huawei_wmi_input_exit(&pdev->dev, guid->guid_string);
>
>
> base-commit: 46cf053efec6a3a5f343fead837777efe8252a46
> --
> 2.24.1
>

--
Thank you,
Ayman

\
 
 \ /
  Last update: 2019-12-26 21:42    [W:0.042 / U:15.528 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site