Received-SPF: pass (google.com: domain of linux-kernel+bounces-71263-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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: [PATCH v2 2/5] platform/x86: wmi: Check if event data is not NULL
Date: Mon, 19 Feb 2024 12:59:16 +0100
Message-Id: <20240219115919.16526-3-W_Armin@gmx.de>
In-Reply-To: <20240219115919.16526-1-W_Armin@gmx.de>
References: <20240219115919.16526-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:H/CzGdRYQmU=;Z4dbjUb4eWLfbUUh7aocnglj65i
 w8woxAjzNaV4uraqxT2Ucqcxc9z57D1UOGrOOo6TL2FvR5ZxhG4fxfKLopDUzvufyPxt4WNDl
 VojMpXcXRnIlw9lCflJ735hqRsJVk3Y1u9ojYnXlCXghmBpmUr5LEuMK9goCcpA3ZYRoxuFdD
 eE+EMUJ22hf8S6MFqhsQhJVuAwbL7T229uX7x00bt0igFZITCIHsW7hER8eUpg4LLN5mE6EuW
 OOnk+rmMO1LIjPF3NPmNB77tL3zHY7C+FWMiK6yQKp2i1hZUjrzgWT3B5gnK/0nS2qqvOKz95
 4+PprIIPWCg05mx7UrZYPM7Z+JuaPE6nHWnWq6jLW0LtVRsIv2SXrTVX0Q9vWcudDGeNiVLy4
 FpwiU460H2Ig3/laZa7wR2SvH/254JjyB6dLLyS375wy6hbwJtULeQzvuLHyfmXf9M6z7XDi1
 6EcEUY4mH6zkOIU30x98TofYBDkHtRaYZYljBkjyxsWjMDSlatmKGmC4IHEnGirvk4e7Xk3SN
 vkW69i3ciEbi0ZUtOIoRPKU8zWYCn2dWRUcoGoz9RrS3385TCgg0AMlxtNaghCzQ6YyLuzxhY
 pSfEjqxfuT2En+P7r0uAD0MAjR0bpflbD0CyXdpqtmZ3pdXSS9OOvKjIZosL9WtihI+jncoYJ
 5Lq6z1BZ4wHirz8ub9vR/TAlflimRKDvLn/gujk7jLcJbDah+ldXRlL84qmQw7QxOwW7EoiYe
 X0vzvMD3yVEyDXT3kuMUSXBQSgUi9ttkkQJTZVll/zA8dKhGhIIKBExyaGXKZUi3p2VKuKhQO
 YmYBPXgVzSe2ZfGXPioNRS11I+mPVZ8HBxLp0eyZ4terE=

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>
=2D--
 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
=2D-- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1210,6 +1210,7 @@ static void wmi_notify_driver(struct wmi_block *wblo=
ck)
 {
 	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 *wb=
lock)
 			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");
+			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)
=2D-
2.39.2