diff options
author | Brian Norris <computersforpeace@gmail.com> | 2017-05-01 20:04:50 -0400 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-05-22 03:42:29 -0400 |
commit | 44d4182e23c555cbfa8b8a0ad2d94664d23850d3 (patch) | |
tree | aaa0c1d2881e3fd6bf69e37c91869a338113ef72 /drivers/mtd/nand | |
parent | 08332893e37af6ae779367e78e444f8f9571511d (diff) |
mtd: nand: don't leak buffers when ->scan_bbt() fails
This bug seems to have been here forever, although we came close to
fixing all of them in [1]!
[1] 11eaf6df1cce ("mtd: nand: Remove BUG() abuse in nand_scan_tail")
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index d474378ed810..66782291a762 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -4842,7 +4842,11 @@ int nand_scan_tail(struct mtd_info *mtd) | |||
4842 | return 0; | 4842 | return 0; |
4843 | 4843 | ||
4844 | /* Build bad block table */ | 4844 | /* Build bad block table */ |
4845 | return chip->scan_bbt(mtd); | 4845 | ret = chip->scan_bbt(mtd); |
4846 | if (ret) | ||
4847 | goto err_free; | ||
4848 | return 0; | ||
4849 | |||
4846 | err_free: | 4850 | err_free: |
4847 | if (nbuf) { | 4851 | if (nbuf) { |
4848 | kfree(nbuf->databuf); | 4852 | kfree(nbuf->databuf); |