| Message ID | 20190301173820.30776-2-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | meson-nand: two small memory related fixes | expand |
Hello Martin, On 2019/3/2 1:38, Martin Blumenstingl wrote: > kzalloc() can return NULL if memory could not be allocated. Check the > return value of the kzalloc() call in meson_nfc_read_buf() to make it > consistent with other memory allocations within the meson_nand driver. > > Fixes: 8fae856c53500a ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > drivers/mtd/nand/raw/meson_nand.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c > index 3e8aa71407b5..a1d8506b61c7 100644 > --- a/drivers/mtd/nand/raw/meson_nand.c > +++ b/drivers/mtd/nand/raw/meson_nand.c > @@ -528,6 +528,9 @@ static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) > u8 *info; > > info = kzalloc(PER_INFO_BYTE, GFP_KERNEL); > + if (!info) > + return -ENOMEM; > + Thank you very much. it is really good to me. Acked-by: Liang Yang <liang.yang@amlogic.com> > ret = meson_nfc_dma_buffer_setup(nand, buf, len, info, > PER_INFO_BYTE, DMA_FROM_DEVICE); > if (ret) >
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 3e8aa71407b5..a1d8506b61c7 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -528,6 +528,9 @@ static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) u8 *info; info = kzalloc(PER_INFO_BYTE, GFP_KERNEL); + if (!info) + return -ENOMEM; + ret = meson_nfc_dma_buffer_setup(nand, buf, len, info, PER_INFO_BYTE, DMA_FROM_DEVICE); if (ret)
kzalloc() can return NULL if memory could not be allocated. Check the return value of the kzalloc() call in meson_nfc_read_buf() to make it consistent with other memory allocations within the meson_nand driver. Fixes: 8fae856c53500a ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/mtd/nand/raw/meson_nand.c | 3 +++ 1 file changed, 3 insertions(+)