diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-12-08 17:37:32 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-12-08 17:37:32 +0100 |
| commit | fa4e1f880424833b767d7f72ffe1f499fac02b88 (patch) | |
| tree | e0cb165f31f865d7a0124c5ac1829ba876eac960 /tools | |
| parent | Linux 6.1-rc8 (diff) | |
| parent | ACPICA: Fix use-after-free in acpi_ut_copy_ipackage_to_ipackage() (diff) | |
| download | wireguard-linux-fa4e1f880424833b767d7f72ffe1f499fac02b88.tar.xz wireguard-linux-fa4e1f880424833b767d7f72ffe1f499fac02b88.zip | |
Merge back ACPICA changes for 6.2-rc1
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/acpi/tools/acpidump/Makefile | 1 | ||||
| -rw-r--r-- | tools/power/acpi/tools/acpidump/apdump.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/power/acpi/tools/acpidump/Makefile b/tools/power/acpi/tools/acpidump/Makefile index 1208a105a871..886bba6c58cd 100644 --- a/tools/power/acpi/tools/acpidump/Makefile +++ b/tools/power/acpi/tools/acpidump/Makefile @@ -28,6 +28,7 @@ TOOL_OBJS = \ tbxfroot.o\ utascii.o\ utbuffer.o\ + utcksum.o\ utdebug.o\ utexcep.o\ utglobal.o\ diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c index d54dde02b87d..ea44b0ed5dcb 100644 --- a/tools/power/acpi/tools/acpidump/apdump.c +++ b/tools/power/acpi/tools/acpidump/apdump.c @@ -78,7 +78,9 @@ u8 ap_is_valid_checksum(struct acpi_table_header *table) rsdp = ACPI_CAST_PTR(struct acpi_table_rsdp, table); status = acpi_tb_validate_rsdp(rsdp); } else { - status = acpi_tb_verify_checksum(table, table->length); + /* We don't have to check for a CDAT here, since CDAT is not in the RSDT/XSDT */ + + status = acpi_ut_verify_checksum(table, table->length); } if (ACPI_FAILURE(status)) { |