Commit 0374a4ea authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Bjorn Andersson
Browse files

remoteproc: Fix a memory leak in an error handling path in 'rproc_handle_vdev()' 



If 'copy_dma_range_map() fails, the memory allocated for 'rvdev' will leak.
Move the 'copy_dma_range_map()' call after the device registration so
that 'rproc_rvdev_release()' can be called to free some resources.

Also, branch to the error handling path if 'copy_dma_range_map()' instead
of a direct return to avoid some other leaks.

Fixes: e0d07278 ("dma-mapping: introduce DMA range map, supplanting dma_pfn_offset")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarJim Quinlan <james.quinlan@broadcom.com>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/e6d0dad6620da4fdf847faa903f79b735d35f262.1630755377.git.christophe.jaillet@wanadoo.fr
parent d6a33c5b

drivers/remoteproc/remoteproc_core.c

+5 −3
Original line number Diff line number Diff line
@@ -556,9 +556,6 @@ static int rproc_handle_vdev(struct rproc *rproc, void *ptr, 
	/* Initialise vdev subdevice */

	snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index);

	rvdev->dev.parent = &rproc->dev;

	ret = copy_dma_range_map(&rvdev->dev, rproc->dev.parent);

	if (ret)

		return ret;

	rvdev->dev.release = rproc_rvdev_release;

	dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name);

	dev_set_drvdata(&rvdev->dev, rvdev);
@@ -568,6 +565,11 @@ static int rproc_handle_vdev(struct rproc *rproc, void *ptr, 
		put_device(&rvdev->dev);

		return ret;

	}



	ret = copy_dma_range_map(&rvdev->dev, rproc->dev.parent);

	if (ret)

		goto free_rvdev;



	/* Make device dma capable by inheriting from parent's capabilities */

	set_dma_ops(&rvdev->dev, get_dma_ops(rproc->dev.parent));