]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls
authorJean-Marc Eurin <jmeurin@google.com>
Wed, 2 Apr 2025 00:15:42 +0000 (17:15 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 May 2025 05:50:58 +0000 (07:50 +0200)
[ Upstream commit 7ab4f0e37a0f4207e742a8de69be03984db6ebf0 ]

The end of table checks should be done with the structure size,
but 2 of the 3 similar calls use the pointer size.

Signed-off-by: Jean-Marc Eurin <jmeurin@google.com>
Link: https://patch.msgid.link/20250402001542.2600671-1-jmeurin@google.com
[ rjw: Subject edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/acpi/pptt.c

index a35dd0e41c27043bc0cb6f8783c1bc0280cb1155..f73ce6e13065dd7fa3873b76f0341b8ed48fa46d 100644 (file)
@@ -229,7 +229,7 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr,
        node_entry = ACPI_PTR_DIFF(node, table_hdr);
        entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr,
                             sizeof(struct acpi_table_pptt));
-       proc_sz = sizeof(struct acpi_pptt_processor *);
+       proc_sz = sizeof(struct acpi_pptt_processor);
 
        while ((unsigned long)entry + proc_sz < table_end) {
                cpu_node = (struct acpi_pptt_processor *)entry;
@@ -270,7 +270,7 @@ static struct acpi_pptt_processor *acpi_find_processor_node(struct acpi_table_he
        table_end = (unsigned long)table_hdr + table_hdr->length;
        entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr,
                             sizeof(struct acpi_table_pptt));
-       proc_sz = sizeof(struct acpi_pptt_processor *);
+       proc_sz = sizeof(struct acpi_pptt_processor);
 
        /* find the processor structure associated with this cpuid */
        while ((unsigned long)entry + proc_sz < table_end) {