From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Peng Fan <peng.fan@nxp.com> Subject: [PATCH] remoteproc: imx_rproc: validate resource table Date: Tue, 11 Jan 2022 11:33:23 +0800 [thread overview] Message-ID: <20220111033333.403448-2-peng.fan@oss.nxp.com> (raw) In-Reply-To: <20220111033333.403448-1-peng.fan@oss.nxp.com> From: Peng Fan <peng.fan@nxp.com> Currently NXP use one device tree to support all NXP released Cortex-M demos. There is one simple demo that not need to communicate with Linux, thus it will not update the resource table. So there maybe garbage data in it. In such case, Linux should directly ignore it. It is hard to decide what data is garbage data, NXP released SDK use ver(1), reserved(0) in a valid resource table. But in case others use different value, so here use 0xff as a max value for ver and num. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/remoteproc/imx_rproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 0bd24c937a73..75fde16f80a4 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -490,11 +490,19 @@ static int imx_rproc_attach(struct rproc *rproc) static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) { struct imx_rproc *priv = rproc->priv; + struct resource_table *table; /* The resource table has already been mapped in imx_rproc_addr_init */ if (!priv->rsc_table) return NULL; + table = priv->rsc_table; + /* Gabage data check */ + if (table->ver >= 0xff || table->num >= 0xff || table->reserved[0] || table->reserved[1]) { + dev_err(priv->dev, "Ignore invalid rsc table\n"); + return NULL; + } + *table_sz = SZ_1K; return (struct resource_table *)priv->rsc_table; } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Peng Fan <peng.fan@nxp.com> Subject: [PATCH] remoteproc: imx_rproc: validate resource table Date: Tue, 11 Jan 2022 11:33:23 +0800 [thread overview] Message-ID: <20220111033333.403448-2-peng.fan@oss.nxp.com> (raw) In-Reply-To: <20220111033333.403448-1-peng.fan@oss.nxp.com> From: Peng Fan <peng.fan@nxp.com> Currently NXP use one device tree to support all NXP released Cortex-M demos. There is one simple demo that not need to communicate with Linux, thus it will not update the resource table. So there maybe garbage data in it. In such case, Linux should directly ignore it. It is hard to decide what data is garbage data, NXP released SDK use ver(1), reserved(0) in a valid resource table. But in case others use different value, so here use 0xff as a max value for ver and num. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/remoteproc/imx_rproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 0bd24c937a73..75fde16f80a4 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -490,11 +490,19 @@ static int imx_rproc_attach(struct rproc *rproc) static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) { struct imx_rproc *priv = rproc->priv; + struct resource_table *table; /* The resource table has already been mapped in imx_rproc_addr_init */ if (!priv->rsc_table) return NULL; + table = priv->rsc_table; + /* Gabage data check */ + if (table->ver >= 0xff || table->num >= 0xff || table->reserved[0] || table->reserved[1]) { + dev_err(priv->dev, "Ignore invalid rsc table\n"); + return NULL; + } + *table_sz = SZ_1K; return (struct resource_table *)priv->rsc_table; } -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-01-11 3:36 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-11 3:33 [PATCH V2] remoteproc: imx_rproc: use imx specific hook for find_loaded_rsc_table Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) [this message] 2022-01-11 3:33 ` [PATCH] remoteproc: imx_rproc: validate resource table Peng Fan (OSS) 2022-01-17 18:25 ` Mathieu Poirier 2022-01-17 18:25 ` Mathieu Poirier 2022-01-18 1:24 ` Peng Fan 2022-01-18 1:24 ` Peng Fan 2022-01-11 3:33 ` [PATCH 0/9] remoteproc: imx_rproc: support i.MX8QXP/QM and self recovery Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 3:33 ` [PATCH 1/9] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 6:44 ` Peng Fan 2022-01-11 6:44 ` Peng Fan 2022-01-18 18:41 ` Mathieu Poirier 2022-01-18 18:41 ` Mathieu Poirier 2022-01-19 2:20 ` Peng Fan 2022-01-19 2:20 ` Peng Fan 2022-01-11 3:33 ` [PATCH 2/9] dt-bindings: remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-11 6:45 ` Peng Fan 2022-01-11 6:45 ` Peng Fan 2022-01-11 3:33 ` [PATCH 3/9] remoteproc: support self recovery after rproc crash Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:44 ` Mathieu Poirier 2022-01-18 18:44 ` Mathieu Poirier 2022-01-19 2:21 ` Peng Fan 2022-01-19 2:21 ` Peng Fan 2022-01-11 3:33 ` [PATCH 4/9] remoteproc: imx_rproc: ignore create mem entry for resource table Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:47 ` Mathieu Poirier 2022-01-18 18:47 ` Mathieu Poirier 2022-01-19 2:23 ` Peng Fan 2022-01-19 2:23 ` Peng Fan 2022-01-11 3:33 ` [PATCH 5/9] remoteproc: imx_rproc: make clk optional Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:50 ` Mathieu Poirier 2022-01-18 18:50 ` Mathieu Poirier 2022-01-19 2:25 ` Peng Fan 2022-01-19 2:25 ` Peng Fan 2022-01-19 17:49 ` Mathieu Poirier 2022-01-19 17:49 ` Mathieu Poirier 2022-01-11 3:33 ` [PATCH 6/9] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-18 18:57 ` Mathieu Poirier 2022-01-18 18:57 ` Mathieu Poirier 2022-01-19 2:28 ` Peng Fan 2022-01-19 2:28 ` Peng Fan 2022-01-19 18:04 ` Mathieu Poirier 2022-01-19 18:04 ` Mathieu Poirier 2022-01-19 18:31 ` Mathieu Poirier 2022-01-19 18:31 ` Mathieu Poirier 2022-01-11 3:33 ` [PATCH 7/9] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-19 18:58 ` Mathieu Poirier 2022-01-19 18:58 ` Mathieu Poirier 2022-01-11 3:33 ` [PATCH 8/9] remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-01-20 17:23 ` Mathieu Poirier 2022-01-20 17:23 ` Mathieu Poirier 2022-01-21 1:00 ` Peng Fan 2022-01-21 1:00 ` Peng Fan 2022-01-11 3:33 ` [PATCH 9/9] remoteproc: imx_rproc: request mbox channel later Peng Fan (OSS) 2022-01-11 3:33 ` Peng Fan (OSS) 2022-12-21 10:55 ` [PATCH V2] remoteproc: imx_rproc: use imx specific hook for find_loaded_rsc_table Marco Felsch 2022-12-21 10:55 ` Marco Felsch 2023-01-02 22:46 ` Mathieu Poirier 2023-01-02 22:46 ` Mathieu Poirier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220111033333.403448-2-peng.fan@oss.nxp.com \ --to=peng.fan@oss.nxp.com \ --cc=bjorn.andersson@linaro.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=mathieu.poirier@linaro.org \ --cc=peng.fan@nxp.com \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.