[RFC PATCH 1/2] platform/x86: huawei-wmi: serialize WMI retries and validate responses
From: Fuwei Xie
Date: Sat Nov 07 2026 - 23:18:21 EST
The two-call firmware handshake can be re-entered and each retry leaked the
previous response. Hold the transaction under the driver mutex, free the
response before retrying, validate the returned payload shape, and reject
short responses instead of letting callers read incomplete data.
The borrowed payload points into the ACPI allocation and is not modified.
Signed-off-by: Fuwei Xie <12313607@xxxxxxxxxxxxxxxxxxx>
---
drivers/platform/x86/huawei-wmi.c | 119 +++++++++++++++---------------
1 file changed, 60 insertions(+), 59 deletions(-)
diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
index 96ee9a97c..504ee2737 100644
--- a/drivers/platform/x86/huawei-wmi.c
+++ b/drivers/platform/x86/huawei-wmi.c
@@ -150,14 +150,12 @@ static const struct dmi_system_id huawei_quirks[] = {
/* Utils */
-static int huawei_wmi_call(struct huawei_wmi *huawei,
- struct acpi_buffer *in, struct acpi_buffer *out)
+static int __huawei_wmi_call(struct huawei_wmi *huawei,
+ struct acpi_buffer *in, struct acpi_buffer *out)
{
acpi_status status;
- mutex_lock(&huawei->wmi_lock);
status = wmi_evaluate_method(HWMI_METHOD_GUID, 0, 1, in, out);
- mutex_unlock(&huawei->wmi_lock);
if (ACPI_FAILURE(status)) {
dev_err(huawei->dev, "Failed to evaluate wmi method\n");
return -ENODEV;
@@ -166,6 +164,45 @@ static int huawei_wmi_call(struct huawei_wmi *huawei,
return 0;
}
+static int huawei_wmi_call(struct huawei_wmi *huawei,
+ struct acpi_buffer *in, struct acpi_buffer *out)
+{
+ int ret;
+
+ mutex_lock(&huawei->wmi_lock);
+ ret = __huawei_wmi_call(huawei, in, out);
+ mutex_unlock(&huawei->wmi_lock);
+ return ret;
+}
+
+/* Return a borrowed payload without modifying the ACPI allocation. */
+static int huawei_wmi_response(const union acpi_object *obj,
+ const u8 **data, size_t *len)
+{
+ if (!obj)
+ return -EIO;
+
+ if (obj->type == ACPI_TYPE_BUFFER) {
+ if (obj->buffer.length != 0x104 || !obj->buffer.pointer)
+ return -EIO;
+ *data = obj->buffer.pointer + 4;
+ *len = 0x100;
+ } else if (obj->type == ACPI_TYPE_PACKAGE) {
+ if (obj->package.count != 2 || !obj->package.elements)
+ return -EIO;
+ obj = &obj->package.elements[1];
+ if (obj->type != ACPI_TYPE_BUFFER || !obj->buffer.length ||
+ !obj->buffer.pointer)
+ return -EIO;
+ *data = obj->buffer.pointer;
+ *len = obj->buffer.length;
+ } else {
+ return -EIO;
+ }
+
+ return 0;
+}
+
/* HWMI takes a 64 bit input and returns either a package with 2 buffers, one of
* 4 bytes and the other of 256 bytes, or one buffer of size 0x104 (260) bytes.
* The first 4 bytes are ignored, we ignore the first 4 bytes buffer if we got a
@@ -179,82 +216,46 @@ static int huawei_wmi_cmd(u64 arg, u8 *buf, size_t buflen)
struct huawei_wmi *huawei = huawei_wmi;
struct acpi_buffer out = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer in;
- union acpi_object *obj;
+ const u8 *data;
size_t len;
int err, i;
in.length = sizeof(arg);
in.pointer = &arg;
+ /* Keep both halves of the firmware handshake in one transaction. */
+ mutex_lock(&huawei->wmi_lock);
/* Some models require calling HWMI twice to execute a command. We evaluate
* HWMI and if we get a non-zero return status we evaluate it again.
*/
for (i = 0; i < 2; i++) {
- err = huawei_wmi_call(huawei, &in, &out);
+ out.length = ACPI_ALLOCATE_BUFFER;
+ out.pointer = NULL;
+ err = __huawei_wmi_call(huawei, &in, &out);
if (err)
goto fail_cmd;
- obj = out.pointer;
- if (!obj) {
- err = -EIO;
+ err = huawei_wmi_response(out.pointer, &data, &len);
+ if (err)
goto fail_cmd;
- }
-
- switch (obj->type) {
- /* Models that implement both "legacy" and HWMI tend to return a 0x104
- * sized buffer instead of a package of 0x4 and 0x100 buffers.
- */
- case ACPI_TYPE_BUFFER:
- if (obj->buffer.length == 0x104) {
- // Skip the first 4 bytes.
- obj->buffer.pointer += 4;
- len = 0x100;
- } else {
- dev_err(huawei->dev, "Bad buffer length, got %d\n", obj->buffer.length);
- err = -EIO;
- goto fail_cmd;
- }
-
- break;
- /* HWMI returns a package with 2 buffer elements, one of 4 bytes and the
- * other is 256 bytes.
- */
- case ACPI_TYPE_PACKAGE:
- if (obj->package.count != 2) {
- dev_err(huawei->dev, "Bad package count, got %d\n", obj->package.count);
- err = -EIO;
- goto fail_cmd;
- }
-
- obj = &obj->package.elements[1];
- if (obj->type != ACPI_TYPE_BUFFER) {
- dev_err(huawei->dev, "Bad package element type, got %d\n", obj->type);
- err = -EIO;
- goto fail_cmd;
+ if (!data[0] || i == 1) {
+ err = data[0] ? -ENODEV : 0;
+ if (buf) {
+ if (len < buflen) {
+ err = -ENODATA;
+ goto fail_cmd;
+ }
+ memcpy(buf, data, buflen);
}
- len = obj->buffer.length;
-
- break;
- /* Shouldn't get here! */
- default:
- dev_err(huawei->dev, "Unexpected obj type, got: %d\n", obj->type);
- err = -EIO;
goto fail_cmd;
}
-
- if (!*obj->buffer.pointer)
- break;
- }
-
- err = (*obj->buffer.pointer) ? -ENODEV : 0;
-
- if (buf) {
- len = min(buflen, len);
- memcpy(buf, obj->buffer.pointer, len);
+ kfree(out.pointer);
+ out.pointer = NULL;
}
fail_cmd:
kfree(out.pointer);
+ mutex_unlock(&huawei->wmi_lock);
return err;
}
--
2.53.0