| Message ID | 20250313-qpic-snand-memleak-fix-v1-1-e54e78d1da3a@gmail.com |
|---|---|
| State | Accepted |
| Commit | d450cdd9c4398add1f2aa7200f2c95f1e3b9f9fa |
| Headers | show |
| Series | [next] spi: spi-qpic-snand: avoid memleak in qcom_spi_ecc_init_ctx_pipelined() | expand |
On Thu, 13 Mar 2025 19:31:21 +0100, Gabor Juhos wrote: > 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. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: spi-qpic-snand: avoid memleak in qcom_spi_ecc_init_ctx_pipelined() commit: d450cdd9c4398add1f2aa7200f2c95f1e3b9f9fa All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-qpic-snand.c b/drivers/spi/spi-qpic-snand.c index ffb2b6ec685ce3e0b6c56fa38988c5de011445e7..fbba7741a9bf336deed1c07eab8d5a94204878d7 100644 --- 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_pipelined(struct nand_device *nand) 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);
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> --- drivers/spi/spi-qpic-snand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- base-commit: cce2200dacd6d7e0501c3811f24f5216710968fb change-id: 20250313-qpic-snand-memleak-fix-4f1e4a641c69 Best regards,