mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-08 21:42:04 +08:00
923677a74b
QCOM SPI NAND driver got merged upstream hence we can drop the special patch from qualcommax and qualcommbe target and move them to the generic backports directory to reduce patch maintenance. While at it refresh any affected patch and target and also backport other minor fixup for the SPI NAND driver merged upstream later. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From d450cdd9c4398add1f2aa7200f2c95f1e3b9f9fa Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <j4g8y7@gmail.com>
|
|
Date: Thu, 13 Mar 2025 19:31:21 +0100
|
|
Subject: [PATCH] spi: spi-qpic-snand: avoid memleak in
|
|
qcom_spi_ecc_init_ctx_pipelined()
|
|
|
|
When the allocation of the OOB buffer fails, the
|
|
qcom_spi_ecc_init_ctx_pipelined() function returns without freeing
|
|
the memory allocated for 'ecc_cfg' thus it can cause a memory leak.
|
|
|
|
Call kfree() to free 'ecc_cfg' before returning from the function
|
|
to avoid that.
|
|
|
|
Fixes: 7304d1909080 ("spi: spi-qpic: add driver for QCOM SPI NAND flash Interface")
|
|
Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
|
|
Link: https://patch.msgid.link/20250313-qpic-snand-memleak-fix-v1-1-e54e78d1da3a@gmail.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-qpic-snand.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/spi/spi-qpic-snand.c
|
|
+++ b/drivers/spi/spi-qpic-snand.c
|
|
@@ -263,8 +263,10 @@ static int qcom_spi_ecc_init_ctx_pipelin
|
|
return -ENOMEM;
|
|
snandc->qspi->oob_buf = kzalloc(mtd->writesize + mtd->oobsize,
|
|
GFP_KERNEL);
|
|
- if (!snandc->qspi->oob_buf)
|
|
+ if (!snandc->qspi->oob_buf) {
|
|
+ kfree(ecc_cfg);
|
|
return -ENOMEM;
|
|
+ }
|
|
|
|
memset(snandc->qspi->oob_buf, 0xff, mtd->writesize + mtd->oobsize);
|
|
|