Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-17 10:24:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

acpi_table: Add asserts in IORT

Browse source 
Check that the provided offsets are really pointing to a node
that have been previously written and are of the correct type.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
This commit is contained in:
Patrick Rudolph 2025-03-16 09:32:53 +01:00 • committed by Tom Rini
parent 92d448f4f1
commit 0ae343239b
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/acpi/acpi_table.c
View file

@ -635,6 +635,7 @@ int acpi_iort_add_rc(struct acpi_ctx *ctx,
const struct acpi_iort_id_mapping *map) const struct acpi_iort_id_mapping *map)
{ {
struct acpi_iort_id_mapping *mapping; struct acpi_iort_id_mapping *mapping;
struct acpi_iort_node *output_node;
struct acpi_iort_node *node; struct acpi_iort_node *node;
struct acpi_iort_rc *rc; struct acpi_iort_rc *rc;
int offset; int offset;
@ -661,6 +662,13 @@ int acpi_iort_add_rc(struct acpi_ctx *ctx,
mapping = (struct acpi_iort_id_mapping *)(rc + 1); mapping = (struct acpi_iort_id_mapping *)(rc + 1);
for (int i = 0; i < num_mappings; i++) { for (int i = 0; i < num_mappings; i++) {
/* Validate input */
output_node = (struct acpi_iort_node *)ctx->tab_start + map[i].output_reference;
/* ID mappings can use SMMUs or ITS groups as output references */
assert(output_node && ((output_node->type == ACPI_IORT_NODE_ITS_GROUP) ||
(output_node->type == ACPI_IORT_NODE_SMMU) ||
(output_node->type == ACPI_IORT_NODE_SMMU_V3)));
memcpy(mapping, &map[i], sizeof(struct acpi_iort_id_mapping)); memcpy(mapping, &map[i], sizeof(struct acpi_iort_id_mapping));
mapping++; mapping++;
} }
@ -685,6 +693,7 @@ int acpi_iort_add_smmu_v3(struct acpi_ctx *ctx,
const struct acpi_iort_id_mapping *map) const struct acpi_iort_id_mapping *map)
{ {
struct acpi_iort_node *node; struct acpi_iort_node *node;
struct acpi_iort_node *output_node;
struct acpi_iort_smmu_v3 *smmu; struct acpi_iort_smmu_v3 *smmu;
struct acpi_iort_id_mapping *mapping; struct acpi_iort_id_mapping *mapping;
int offset; int offset;
@ -718,6 +727,14 @@ int acpi_iort_add_smmu_v3(struct acpi_ctx *ctx,
mapping = (struct acpi_iort_id_mapping *)(smmu + 1); mapping = (struct acpi_iort_id_mapping *)(smmu + 1);
for (int i = 0; i < num_mappings; i++) { for (int i = 0; i < num_mappings; i++) {
/* Validate input */
output_node = (struct acpi_iort_node *)ctx->tab_start + map[i].output_reference;
/*
* ID mappings of an SMMUv3 node can only have ITS group nodes
* as output references.
*/
assert(output_node && output_node->type == ACPI_IORT_NODE_ITS_GROUP);
memcpy(mapping, &map[i], sizeof(struct acpi_iort_id_mapping)); memcpy(mapping, &map[i], sizeof(struct acpi_iort_id_mapping));
mapping++; mapping++;
} }