redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-23882 remoteproc: imx_rproc: check resource table header 

Before using resource table, check whether this is a valid header.
M4 image might not publish a valid header, so let's catch it to avoid
kernel panic.

Reviewed-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Peng Fan 2020-04-30 12:08:13 +08:00
parent 4bbe573768
commit d85cedb6d0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/remoteproc/imx_rproc.c
View File

@ -628,7 +628,7 @@ static int check_dt_rsc_table(struct rproc *rproc)
/*Parse device tree to get resource table */
elems = of_property_count_u32_elems(np, "rsrc-table");
if (elems < 0) {
dev_err(&rproc->dev, "no rsrc-table\n");
dev_err(&rproc->dev, "no dtb rsrc-table\n");
return elems;
}
@ -716,6 +716,12 @@ static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
}
table = (struct resource_table *)priv->rsc_va;
if (table->ver != 1 || table->reserved[0] || table->reserved[1]) {
dev_err(priv->dev, "Invalid rsrc table header\n");
return 0;
}
/* Assuming that the resource table fits in 1kB is fair */
rproc->cached_table = kmemdup(table, SZ_1K, GFP_KERNEL);
if (!rproc->cached_table)