| Message ID | 20250402001542.2600671-1-jmeurin@google.com |
|---|---|
| State | Accepted |
| Commit | 7ab4f0e37a0f4207e742a8de69be03984db6ebf0 |
| Headers | show |
| Series | ACPI PPTT: Fix typos in a couple of sizeof() calls. | expand |
On Wed, Apr 2, 2025 at 2:15 AM Jean-Marc Eurin <jmeurin@google.com> wrote: > > 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> > --- > drivers/acpi/pptt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c > index a35dd0e41c27..f73ce6e13065 100644 > --- a/drivers/acpi/pptt.c > +++ b/drivers/acpi/pptt.c > @@ -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) { > -- Applied as 6.15-rc material with a couple of edits in the subject. Thanks!
diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index a35dd0e41c27..f73ce6e13065 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -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) {
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> --- drivers/acpi/pptt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)