target/linux/generic/hack-4.14/400-mt29f_spinand-fix-memleak.patch

   1 --- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
   2 +++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
   3 @@ -492,7 +492,7 @@ static int spinand_program_page(struct s
   4  #ifdef CONFIG_MTD_SPINAND_ONDIEECC
   5         unsigned int i, j;
   6
   7 -       wbuf = devm_kzalloc(&spi_nand->dev, CACHE_BUF, GFP_KERNEL);
   8 +       wbuf = kzalloc(CACHE_BUF, GFP_KERNEL);
   9         if (!wbuf)
  10                 return -ENOMEM;
  11
  12 @@ -500,7 +500,7 @@ static int spinand_program_page(struct s
  13         retval = spinand_read_page(spi_nand, page_id, 0, CACHE_BUF, wbuf);
  14         if (retval < 0) {
  15                 dev_err(&spi_nand->dev, "ecc error on read page!!!\n");
  16 -               return retval;
  17 +               goto cleanup;
  18         }
  19
  20         for (i = offset, j = 0; i < len; i++, j++)
  21 @@ -510,7 +510,7 @@ static int spinand_program_page(struct s
  22                 retval = spinand_enable_ecc(spi_nand);
  23                 if (retval < 0) {
  24                         dev_err(&spi_nand->dev, "enable ecc failed!!\n");
  25 -                       return retval;
  26 +                       goto cleanup;
  27                 }
  28         }
  29  #else
  30 @@ -519,7 +519,7 @@ static int spinand_program_page(struct s
  31         retval = spinand_write_enable(spi_nand);
  32         if (retval < 0) {
  33                 dev_err(&spi_nand->dev, "write enable failed!!\n");
  34 -               return retval;
  35 +               goto cleanup;
  36         }
  37         if (wait_till_ready(spi_nand))
  38                 dev_err(&spi_nand->dev, "wait timedout!!!\n");
  39 @@ -527,23 +527,24 @@ static int spinand_program_page(struct s
  40         retval = spinand_program_data_to_cache(spi_nand, page_id,
  41                                                offset, len, wbuf);
  42         if (retval < 0)
  43 -               return retval;
  44 +               goto cleanup;
  45         retval = spinand_program_execute(spi_nand, page_id);
  46         if (retval < 0)
  47 -               return retval;
  48 +               goto cleanup;
  49         while (1) {
  50                 retval = spinand_read_status(spi_nand, &status);
  51                 if (retval < 0) {
  52                         dev_err(&spi_nand->dev,
  53                                 "error %d reading status register\n", retval);
  54 -                       return retval;
  55 +                       goto cleanup;
  56                 }
  57
  58                 if ((status & STATUS_OIP_MASK) == STATUS_READY) {
  59                         if ((status & STATUS_P_FAIL_MASK) == STATUS_P_FAIL) {
  60                                 dev_err(&spi_nand->dev,
  61                                         "program error, page %d\n", page_id);
  62 -                               return -1;
  63 +                               retval = -1;
  64 +                               goto cleanup;
  65                         }
  66                         break;
  67                 }
  68 @@ -553,13 +554,20 @@ static int spinand_program_page(struct s
  69                 retval = spinand_disable_ecc(spi_nand);
  70                 if (retval < 0) {
  71                         dev_err(&spi_nand->dev, "disable ecc failed!!\n");
  72 -                       return retval;
  73 +                       goto cleanup;
  74                 }
  75                 enable_hw_ecc = 0;
  76         }
  77 +       kfree(wbuf);
  78  #endif
  79 -
  80         return 0;
  81 +
  82 +cleanup:
  83 +#ifdef CONFIG_MTD_SPINAND_ONDIEECC
  84 +       kfree(wbuf);
  85 +#endif
  86 +       return retval;
  87 +
  88  }
  89
  90  /**