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

Commit 61a4e9e9 authored by Timur Tabi's avatar Timur Tabi Committed by Kumar Gala
Browse files

powerpc: fix memory leaks in QE library 



Fix two memory leaks in the Freescale QE library: add a missing kfree() in
ucc_fast_init() and ucc_slow_init() if the ioremap() fails, and update
ucc_fast_free() and ucc_slow_free() to call iounmap() if necessary.

Based on a patch from Tony Breeds <tony@bakeyournoodle.com>.

Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent d27a736c

arch/powerpc/sysdev/qe_lib/ucc_fast.c

+4 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc 
	uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));

	if (uccf->uf_regs == NULL) {

		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);

		kfree(uccf);

		return -ENOMEM;

	}
@@ -355,6 +356,9 @@ void ucc_fast_free(struct ucc_fast_private * uccf) 
	if (uccf->ucc_fast_rx_virtual_fifo_base_offset)

		qe_muram_free(uccf->ucc_fast_rx_virtual_fifo_base_offset);



	if (uccf->uf_regs)

		iounmap(uccf->uf_regs);



	kfree(uccf);

}

EXPORT_SYMBOL(ucc_fast_free);

arch/powerpc/sysdev/qe_lib/ucc_slow.c

+5 −3
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc 
	uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));

	if (uccs->us_regs == NULL) {

		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);

		kfree(uccs);

		return -ENOMEM;

	}
@@ -367,10 +368,11 @@ void ucc_slow_free(struct ucc_slow_private * uccs) 
	if (uccs->tx_base_offset)

		qe_muram_free(uccs->tx_base_offset);



	if (uccs->us_pram) {

	if (uccs->us_pram)

		qe_muram_free(uccs->us_pram_offset);

		uccs->us_pram = NULL;

	}



	if (uccs->us_regs)

		iounmap(uccs->us_regs);



	kfree(uccs);

}