Skip to content
/ linux Public

Commit 65379ad

Browse files
MrVanSasha Levin
authored andcommitted
remoteproc: imx_rproc: Fix invalid loaded resource table detection
[ Upstream commit 26aa529 ] imx_rproc_elf_find_loaded_rsc_table() may incorrectly report a loaded resource table even when the current firmware does not provide one. When the device tree contains a "rsc-table" entry, priv->rsc_table is non-NULL and denotes where a resource table would be located if one is present in memory. However, when the current firmware has no resource table, rproc->table_ptr is NULL. The function still returns priv->rsc_table, and the remoteproc core interprets this as a valid loaded resource table. Fix this by returning NULL from imx_rproc_elf_find_loaded_rsc_table() when there is no resource table for the current firmware (i.e. when rproc->table_ptr is NULL). This aligns the function's semantics with the remoteproc core: a loaded resource table is only reported when a valid table_ptr exists. With this change, starting firmware without a resource table no longer triggers a crash. Fixes: e954a1b ("remoteproc: imx_rproc: Use imx specific hook for find_loaded_rsc_table") Cc: stable@vger.kernel.org Signed-off-by: Peng Fan <peng.fan@nxp.com> Acked-by: Daniel Baluta <daniel.baluta@nxp.com> Link: https://lore.kernel.org/r/20260129-imx-rproc-fix-v3-1-fc4e41e6e750@nxp.com Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent e00549d commit 65379ad

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/remoteproc/imx_rproc.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,10 @@ imx_rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *
667667
{
668668
struct imx_rproc *priv = rproc->priv;
669669

670+
/* No resource table in the firmware */
671+
if (!rproc->table_ptr)
672+
return NULL;
673+
670674
if (priv->rsc_table)
671675
return (struct resource_table *)priv->rsc_table;
672676

0 commit comments

Comments
 (0)