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

Commit 6d50e9b6 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Miquel Raynal
Browse files

mtd: rawnand: meson: fix a potential memory leak in meson_nfc_read_buf 



meson_nfc_dma_buffer_setup() is called with the "info" buffer which is
allocated a few lines before using kzalloc(). If
meson_nfc_dma_buffer_setup() fails we need to free the allocated "info"
buffer instead of only freeing it upon success.

Fixes: 8fae856c ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: default avatarLiang Yang <liang.yang@amlogic.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 91e9dd77

drivers/mtd/nand/raw/meson_nand.c

+3 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) 
	ret = meson_nfc_dma_buffer_setup(nand, buf, len, info,

					 PER_INFO_BYTE, DMA_FROM_DEVICE);

	if (ret)

		return ret;

		goto out;



	cmd = NFC_CMD_N2M | (len & GENMASK(5, 0));

	writel(cmd, nfc->reg_base + NFC_REG_CMD);
@@ -542,6 +542,8 @@ static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) 
	meson_nfc_drain_cmd(nfc);

	meson_nfc_wait_cmd_finish(nfc, 1000);

	meson_nfc_dma_buffer_release(nand, len, PER_INFO_BYTE, DMA_FROM_DEVICE);



out:

	kfree(info);



	return ret;