From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Zhen Ni <zhen.ni@easystack.cn>
Cc: andersson@kernel.org, linux-remoteproc@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH v2] remoteproc: pru: Fix potential NULL pointer dereference in pru_rproc_set_ctable()
Date: Tue, 23 Sep 2025 12:01:51 -0600 [thread overview]
Message-ID: <aNLgj49Gm9-j4wbe@p14s> (raw)
In-Reply-To: <20250923112109.1165126-1-zhen.ni@easystack.cn>
On Tue, Sep 23, 2025 at 07:21:09PM +0800, Zhen Ni wrote:
> pru_rproc_set_ctable() accessed rproc->priv before the IS_ERR_OR_NULL
> check, which could lead to a null pointer dereference. Move the pru
> assignment, ensuring we never dereference a NULL rproc pointer.
>
> Fixes: 102853400321 ("remoteproc: pru: Add pru_rproc_set_ctable() function")
> Cc: stable@vger.kernel.org
> Signed-off-by: Zhen Ni <zhen.ni@easystack.cn>
Applied.
Thanks,
Mathieu
> ---
> v2:
> - Changed "null" to "NULL"
> - Added " pru:" prefix
> ---
> drivers/remoteproc/pru_rproc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
> index 842e4b6cc5f9..5e3eb7b86a0e 100644
> --- a/drivers/remoteproc/pru_rproc.c
> +++ b/drivers/remoteproc/pru_rproc.c
> @@ -340,7 +340,7 @@ EXPORT_SYMBOL_GPL(pru_rproc_put);
> */
> int pru_rproc_set_ctable(struct rproc *rproc, enum pru_ctable_idx c, u32 addr)
> {
> - struct pru_rproc *pru = rproc->priv;
> + struct pru_rproc *pru;
> unsigned int reg;
> u32 mask, set;
> u16 idx;
> @@ -352,6 +352,7 @@ int pru_rproc_set_ctable(struct rproc *rproc, enum pru_ctable_idx c, u32 addr)
> if (!rproc->dev.parent || !is_pru_rproc(rproc->dev.parent))
> return -ENODEV;
>
> + pru = rproc->priv;
> /* pointer is 16 bit and index is 8-bit so mask out the rest */
> idx_mask = (c >= PRU_C28) ? 0xFFFF : 0xFF;
>
> --
> 2.20.1
>
prev parent reply other threads:[~2025-09-23 18:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-23 8:38 [PATCH] remoteproc: Fix potential null pointer dereference in pru_rproc_set_ctable() Zhen Ni
2025-09-23 9:40 ` Zhongqiu Han
2025-09-23 9:52 ` Zhongqiu Han
2025-09-23 11:21 ` [PATCH v2] remoteproc: pru: Fix potential NULL " Zhen Ni
2025-09-23 13:36 ` Zhongqiu Han
2025-09-23 18:01 ` Mathieu Poirier [this message]
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=aNLgj49Gm9-j4wbe@p14s \
--to=mathieu.poirier@linaro.org \
--cc=andersson@kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=zhen.ni@easystack.cn \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox