Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b96fe66 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-next-v5.1-3' of... 

Merge tag 'soc-fsl-next-v5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/drivers

NXP/FSL SoC driver updates for v5.1 take3

DPIO driver
- fixed a use after free problem
- fixed a memory leak on error path

* tag 'soc-fsl-next-v5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux

:
  soc: fsl: dpio: fix memory leak of a struct qbman on error exit path
  soc: fsl: dpio: Use after free in dpaa2_dpio_remove()

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bb872709 bd3bd3b3

drivers/soc/fsl/dpio/dpio-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -220,12 +220,12 @@ static int dpaa2_dpio_remove(struct fsl_mc_device *dpio_dev) 


	dev = &dpio_dev->dev;

	priv = dev_get_drvdata(dev);

	cpu = dpaa2_io_get_cpu(priv->io);



	dpaa2_io_down(priv->io);



	dpio_teardown_irqs(dpio_dev);



	cpu = dpaa2_io_get_cpu(priv->io);

	cpumask_set_cpu(cpu, cpus_unused_mask);



	err = dpio_open(dpio_dev->mc_io, 0, dpio_dev->obj_desc.id,

drivers/soc/fsl/dpio/qbman-portal.c

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d) 
	reg = qbman_read_register(p, QBMAN_CINH_SWP_CFG);

	if (!reg) {

		pr_err("qbman: the portal is not enabled!\n");

		kfree(p);

		return NULL;

	}