Commit d41e075b authored by Zhen Ni's avatar Zhen Ni Committed by Mathieu Poirier
Browse files

remoteproc: pru: Fix potential NULL pointer dereference in pru_rproc_set_ctable() 



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: 10285340 ("remoteproc: pru: Add pru_rproc_set_ctable() function")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarZhen Ni <zhen.ni@easystack.cn>
Link: https://lore.kernel.org/r/20250923112109.1165126-1-zhen.ni@easystack.cn


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 1ae4e2db

drivers/remoteproc/pru_rproc.c

+2 −1
Original line number Diff line number Diff line
@@ -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;