diff options
| author | Martin Blumenstingl | 2019-03-18 21:47:22 +0100 |
|---|---|---|
| committer | Miquel Raynal | 2019-03-21 16:48:59 +0100 |
| commit | 6d50e9b6dcd0013c2ab690fcd1f3efce9daf9ce9 (patch) | |
| tree | 2e7bec8ecf89d1137f5cf20ad89756ca09214c55 /drivers/mtd | |
| parent | mtd: rawnand: meson: add missing ENOMEM check in meson_nfc_read_buf() (diff) | |
| download | kernel-qcow2-linux-6d50e9b6dcd0013c2ab690fcd1f3efce9daf9ce9.tar.gz kernel-qcow2-linux-6d50e9b6dcd0013c2ab690fcd1f3efce9daf9ce9.tar.xz kernel-qcow2-linux-6d50e9b6dcd0013c2ab690fcd1f3efce9daf9ce9.zip | |
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: 8fae856c53500a ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Liang Yang <liang.yang@amlogic.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/meson_nand.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index a1d8506b61c7..38db4fd61459 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -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; |