Received-SPF: pass (google.com: domain of linux-kernel+bounces-73997-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <1dbec6ed-8af0-4433-8b6c-98759a21a287@gmx.de>
Date: Wed, 21 Feb 2024 04:21:25 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 2/5] platform/x86: wmi: Check if event data is not NULL
To: =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Cc: corentin.chary@gmail.com, luke@ljones.dev,
 Hans de Goede <hdegoede@redhat.com>, platform-driver-x86@vger.kernel.org,
 LKML <linux-kernel@vger.kernel.org>
References: <20240219115919.16526-1-W_Armin@gmx.de>
 <20240219115919.16526-3-W_Armin@gmx.de>
 <dcb7c031-b920-4774-a1a9-fed8813390d0@gmx.de>
 <954e9d5e-4800-aba9-4678-44584baaea05@linux.intel.com>
Content-Language: en-US
From: Armin Wolf <W_Armin@gmx.de>
In-Reply-To: <954e9d5e-4800-aba9-4678-44584baaea05@linux.intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:X9jwYBuaVkc=;jCA/AOe8oxAmOXB+hlSBIjF6A0P
 Wl4y/NU+onHc/XKSSUTPzGe7ecAOVtivRrbUORkwa9yaWWT7+clUNIu48mgvuKpFRlC1W+8Ns
 GOmrUhy40DEIY+gLvHE8gl3eSsRyBbUI9OfqLbrL0s0+Kf+rV9Po6uEROy38fT6TzLFF8iRb+
 W/DmHMOqta02P97TGmjEob8epAEZ1RSJl9WM5XT30yndtYQQAo0v1yGmUp/uXCPsDLamOv4Tn
 8JtNjsEFUeWiJM9KXIIOTBC8mQbempkCtEdyEa0+V0tUe6th7sYRE4mZzK3jdG22eSSgsf5X/
 9/Lzs2IT1lHz7u3jPhdMjllxEqazfqqioIIJR/C+M+BOoN9H3JMH19eja1cKtW6eFwgARp5Wd
 ZZ06IMYFldHdI/5GsQCApSolU9JvyP+x7Uat2soNotkYDbu2c6W47bpizzwB1n1IBavjdsOMJ
 mWgVxn9oFxuQH5XdW5ZMEIdV2q4lInGtTgI5byJDf6HOPT/5GY8FOgdKpQs4KheR2oApqUVRL
 ZtXjIrxtEqbrN1nlw6WgvjW/1tdRipEAIXT2Q/B3v6lz8fqNxHVJ7K7cgqmZ31WX8QOJeCkqN
 hZOrp+uoRmci9rzVhvJjOb9uK5SWQHXirF7sR902riasvB1WK1tACE5MX866nYn2gr+QHRgwQ
 /akGilZSCkY3ZcQxMdKBQcfHeL11Fv6k4mkmAO5N3EXd43GKs5gb9nRDK9/eV4b2o7Ua69sr/
 CV+1i6LfpQzftw5thDaC0tcPScHMycbE3QPVzeK6XokLU5hFbEyEucrEZEBhpuhfFHEadfaLk
 rGZuFFXIPaaBxhTXIXIV9Drlw8FeYe+fuSFivRVytFRNc=

Am 20.02.24 um 10:19 schrieb Ilpo J=C3=A4rvinen:

> On Tue, 20 Feb 2024, Armin Wolf wrote:
>
>> 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 =3D drv_to_wdrv(wblock->dev.dev.driver);
>>>    	struct acpi_buffer data =3D { ACPI_ALLOCATE_BUFFER, NULL };
>>> +	union acpi_object *obj =3D 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 =3D 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?
> Hi Armin,
>
> As I was doing some history manipulation anyway as is, I tweaked it
> directly in the history. While doing the conflict resolution because of
> that small change I realized the wording got corrected in the latter pat=
ch
> anyway so it was quite harmless but it's now correct in both commits in
> review-ilpo branch.
>
Thank you!