From: Armin Wolf <W_Armin@gmx.de>
To: corentin.chary@gmail.com, luke@ljones.dev
Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/5] platform/x86: wmi: Check if event data is not NULL
Date: Tue, 20 Feb 2024 01:59:31 +0100 [thread overview]
Message-ID: <dcb7c031-b920-4774-a1a9-fed8813390d0@gmx.de> (raw)
In-Reply-To: <20240219115919.16526-3-W_Armin@gmx.de>
Am 19.02.24 um 12:59 schrieb Armin Wolf:
> WMI event drivers which do not have no_notify_data set expect
> that each WMI event contains valid data. Evaluating _WED however
> might return no data, which can cause issues with such drivers.
>
> Fix this by validating that evaluating _WED did return data.
>
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
> drivers/platform/x86/wmi.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index 8fb90b726f50..d0fe8153f803 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -1210,6 +1210,7 @@ static void wmi_notify_driver(struct wmi_block *wblock)
> {
> struct wmi_driver *driver = drv_to_wdrv(wblock->dev.dev.driver);
> struct acpi_buffer data = { ACPI_ALLOCATE_BUFFER, NULL };
> + union acpi_object *obj = NULL;
> acpi_status status;
>
> if (!driver->no_notify_data) {
> @@ -1218,12 +1219,18 @@ static void wmi_notify_driver(struct wmi_block *wblock)
> dev_warn(&wblock->dev.dev, "Failed to get event data\n");
> return;
> }
> +
> + obj = data.pointer;
> + if (!obj) {
> + dev_warn(&wblock->dev.dev, "Event contains not event data\n");
I just noticed that this should have been "Event contains no event data\n". Should i send
another patch?
Armin Wolf
> + return;
> + }
> }
>
> if (driver->notify)
> - driver->notify(&wblock->dev, data.pointer);
> + driver->notify(&wblock->dev, obj);
>
> - kfree(data.pointer);
> + kfree(obj);
> }
>
> static int wmi_notify_device(struct device *dev, void *data)
> --
> 2.39.2
>
>
next prev parent reply other threads:[~2024-02-20 0:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-19 11:59 [PATCH v2 0/5] platform/x86: wmi: Fixes for event data handling Armin Wolf
2024-02-19 11:59 ` [PATCH v2 1/5] platform/x86: wmi: Prevent incompatible event driver from probing Armin Wolf
2024-02-19 11:59 ` [PATCH v2 2/5] platform/x86: wmi: Check if event data is not NULL Armin Wolf
2024-02-20 0:59 ` Armin Wolf [this message]
2024-02-20 9:19 ` Ilpo Järvinen
2024-02-21 3:21 ` Armin Wolf
2024-02-19 11:59 ` [PATCH v2 3/5] platform/x86: wmi: Always evaluate _WED when receiving an event Armin Wolf
2024-02-19 11:59 ` [PATCH v2 4/5] platform/x86: wmi: Update documentation regarding _WED Armin Wolf
2024-02-19 11:59 ` [PATCH v2 5/5] Revert "platform/x86: asus-wmi: Support WMI event queue" Armin Wolf
2024-02-19 12:06 ` [PATCH v2 0/5] platform/x86: wmi: Fixes for event data handling Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dcb7c031-b920-4774-a1a9-fed8813390d0@gmx.de \
--to=w_armin@gmx.de \
--cc=corentin.chary@gmail.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luke@ljones.dev \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®