Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceadfd8d authored by Bhuvanchandra DV's avatar Bhuvanchandra DV Committed by Mark Brown
Browse files

spi: fsl-dspi: Remove possible memory leak of 'chip' 



Move the check for spi->bits_per_word
before allocation, to avoid memory leak.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarBhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9298bc72

drivers/spi/spi-fsl-dspi.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -347,6 +347,13 @@ static int dspi_setup(struct spi_device *spi) 
	struct fsl_dspi *dspi = spi_master_get_devdata(spi->master);

	struct fsl_dspi *dspi = spi_master_get_devdata(spi->master);

	unsigned char br = 0, pbr = 0, fmsz = 0;

	unsigned char br = 0, pbr = 0, fmsz = 0;





	if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) {

		fmsz = spi->bits_per_word - 1;

	} else {

		pr_err("Invalid wordsize\n");

		return -ENODEV;

	}



	/* Only alloc on first setup */

	/* Only alloc on first setup */

	chip = spi_get_ctldata(spi);

	chip = spi_get_ctldata(spi);

	if (chip == NULL) {

	if (chip == NULL) {
@@ -357,12 +364,6 @@ static int dspi_setup(struct spi_device *spi) 




	chip->mcr_val = SPI_MCR_MASTER | SPI_MCR_PCSIS |

	chip->mcr_val = SPI_MCR_MASTER | SPI_MCR_PCSIS |

		SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF;

		SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF;

	if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) {

		fmsz = spi->bits_per_word - 1;

	} else {

		pr_err("Invalid wordsize\n");

		return -ENODEV;

	}





	chip->void_write_data = 0;

	chip->void_write_data = 0;