hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc: qcom: smem: verify partition header size 

Add verification in qcom_smem_partition_header() that the size in a
partition's header structure matches the size in its partition table
entry.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
This commit is contained in:
Alex Elder 2018-06-25 19:58:52 -05:00 committed by Andy Gross
parent ada7928973
commit 190b216c15
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/soc/qcom/smem.c
View File

@ -733,6 +733,7 @@ qcom_smem_partition_header(struct qcom_smem *smem,
struct smem_ptable_entry *entry) struct smem_ptable_entry *entry)
{ {
struct smem_partition_header *header; struct smem_partition_header *header;
u32 size;
header = smem->regions[0].virt_base + le32_to_cpu(entry->offset); header = smem->regions[0].virt_base + le32_to_cpu(entry->offset);
@ -743,6 +744,13 @@ qcom_smem_partition_header(struct qcom_smem *smem,
return NULL; return NULL;
} }
size = le32_to_cpu(header->size);
if (size != le32_to_cpu(entry->size)) {
dev_err(smem->dev, "bad partition size (%u != %u)\n",
size, le32_to_cpu(entry->size));
return NULL;
}
return header; return header;
} }
@ -796,11 +804,6 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem)
return -EINVAL; return -EINVAL;
} }
if (le32_to_cpu(header->size) != le32_to_cpu(entry->size)) {
dev_err(smem->dev, "Global partition has invalid size\n");
return -EINVAL;
}
size = le32_to_cpu(header->offset_free_uncached); size = le32_to_cpu(header->offset_free_uncached);
if (size > le32_to_cpu(header->size)) { if (size > le32_to_cpu(header->size)) {
dev_err(smem->dev, dev_err(smem->dev,
@ -871,12 +874,6 @@ static int qcom_smem_enumerate_partitions(struct qcom_smem *smem,
return -EINVAL; return -EINVAL;
} }
if (le32_to_cpu(header->size) != le32_to_cpu(entry->size)) {
dev_err(smem->dev,
"Partition %d has invalid size\n", i);
return -EINVAL;
}
if (le32_to_cpu(header->offset_free_uncached) > le32_to_cpu(header->size)) { if (le32_to_cpu(header->offset_free_uncached) > le32_to_cpu(header->size)) {
dev_err(smem->dev, dev_err(smem->dev,
"Partition %d has invalid free pointer\n", i); "Partition %d has invalid free pointer\n", i);