diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-08-21 20:47:23 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-08-21 20:47:23 +0200 |
| commit | 670b51121ed09ff3a41539243407e4bd52eea9f4 (patch) | |
| tree | ff36451c4920fc2ce344236e122f145ec2a401b9 | |
| parent | ACPI: APEI: EINJ: Fix resource leak by remove callback in .exit.text (diff) | |
| parent | ACPI: pfr_update: Fix the driver update version check (diff) | |
| download | wireguard-linux-670b51121ed09ff3a41539243407e4bd52eea9f4.tar.xz wireguard-linux-670b51121ed09ff3a41539243407e4bd52eea9f4.zip | |
Merge branches 'acpi-apei' and 'acpi-pfrut'
Merge ACPI APEI fixes and an ACPI platform firmware runtime update fix
for 6.17-rc3.
* acpi-apei:
ACPI: APEI: EINJ: Fix resource leak by remove callback in .exit.text
ACPI: APEI: EINJ: fix potential NULL dereference in __einj_error_inject()
ACPI: APEI: EINJ: Check if user asked for EINJV2 injection
* acpi-pfrut:
ACPI: pfr_update: Fix the driver update version check
| -rw-r--r-- | drivers/acpi/pfr_update.c | 2 | ||||
| -rw-r--r-- | include/uapi/linux/pfrut.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/pfr_update.c b/drivers/acpi/pfr_update.c index 318683744ed1..11b1c2828005 100644 --- a/drivers/acpi/pfr_update.c +++ b/drivers/acpi/pfr_update.c @@ -329,7 +329,7 @@ static bool applicable_image(const void *data, struct pfru_update_cap_info *cap, if (type == PFRU_CODE_INJECT_TYPE) return payload_hdr->rt_ver >= cap->code_rt_version; - return payload_hdr->rt_ver >= cap->drv_rt_version; + return payload_hdr->svn_ver >= cap->drv_svn; } static void print_update_debug_info(struct pfru_updated_result *result, diff --git a/include/uapi/linux/pfrut.h b/include/uapi/linux/pfrut.h index 42fa15f8310d..b77d5c210c26 100644 --- a/include/uapi/linux/pfrut.h +++ b/include/uapi/linux/pfrut.h @@ -89,6 +89,7 @@ struct pfru_payload_hdr { __u32 hw_ver; __u32 rt_ver; __u8 platform_id[16]; + __u32 svn_ver; }; enum pfru_dsm_status { |