Skip to content

Commit b2fe7f2

Browse files
committed
lib: fwts_acpi_tables: fix the passed reserved value
BugLink: https://bugs.launchpad.net/fwts/+bug/2000752 The function fwts_acpi_reserved_type verify the type to see if in reserved, which compares with the value with >= if (value < min || value >= reserved) { So it shouldn't pass the reserved value with RESERVED - 1. Also modify the print out maximum value for reserved. Signed-off-by: Ivan Hu <[email protected]>
1 parent 5fafc9c commit b2fe7f2

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/acpi/hmat/hmat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static int hmat_test1(fwts_framework *fw)
187187
type_length = sizeof(fwts_acpi_table_hmat_cache) +
188188
((fwts_acpi_table_hmat_cache *) entry)->num_smbios * 2;
189189
} else {
190-
fwts_acpi_reserved_type(fw, "HMAT", entry->type, 0, FWTS_HMAT_TYPE_RESERVED - 1, &passed);
190+
fwts_acpi_reserved_type(fw, "HMAT", entry->type, 0, FWTS_HMAT_TYPE_RESERVED, &passed);
191191
break;
192192
}
193193

src/acpi/nfit/nfit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ static int nfit_test1(fwts_framework *fw)
503503
reserved_passed = nfit_struct->reserved2;
504504

505505
} else {
506-
fwts_acpi_reserved_type(fw, "NFIT", entry->type, 0, FWTS_NFIT_TYPE_RESERVED - 1, &passed);
506+
fwts_acpi_reserved_type(fw, "NFIT", entry->type, 0, FWTS_NFIT_TYPE_RESERVED, &passed);
507507
break;
508508
}
509509

src/acpi/phat/phat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static int phat_test1(fwts_framework *fw)
145145
} else if (entry->type == FWTS_PHAT_HEALTH) {
146146
phat_health_test(fw, (fwts_acpi_table_phat_health *) entry, offset, &passed);
147147
} else {
148-
fwts_acpi_reserved_type(fw, "PHAT", entry->type, 0, FWTS_PHAT_RESERVED - 1, &passed);
148+
fwts_acpi_reserved_type(fw, "PHAT", entry->type, 0, FWTS_PHAT_RESERVED, &passed);
149149
break;
150150
}
151151

src/acpi/pptt/pptt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static int pptt_test1(fwts_framework *fw)
153153
pptt_id_test(fw, (fwts_acpi_table_pptt_id *) entry, &passed);
154154
type_length = sizeof(fwts_acpi_table_pptt_id);
155155
} else {
156-
fwts_acpi_reserved_type(fw, "PPTT", entry->type, 0, FWTS_PPTT_RESERVED - 1, &passed);
156+
fwts_acpi_reserved_type(fw, "PPTT", entry->type, 0, FWTS_PPTT_RESERVED, &passed);
157157
break;
158158
}
159159

src/lib/src/fwts_acpi_tables.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ void fwts_acpi_reserved_type(
16011601
fwts_failed(fw, LOG_LEVEL_HIGH, label,
16021602
"%4.4s must have subtable with Type %" PRId8
16031603
"..%" PRId8 ", got %" PRId8 " instead",
1604-
table, min, reserved, value);
1604+
table, min, reserved - 1, value);
16051605

16061606
*passed = false;
16071607
}

0 commit comments

Comments
 (0)