iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serial: max3107: Fix memory leaks when returning on error

Browse Source 
Fix memory leaks in max3107_probe() when returning on error.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Davidlohr Bueso 2010-09-13 12:08:11 -04:00 committed by Greg Kroah-Hartman
parent 91efa75ce1
commit 68707539df
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/serial/max3107.c
View File

@ -986,12 +986,14 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)
s->rxbuf = kzalloc(sizeof(u16) * (MAX3107_RX_FIFO_SIZE+2), GFP_KERNEL); s->rxbuf = kzalloc(sizeof(u16) * (MAX3107_RX_FIFO_SIZE+2), GFP_KERNEL);
if (!s->rxbuf) { if (!s->rxbuf) {
pr_err("Allocating RX buffer failed\n"); pr_err("Allocating RX buffer failed\n");
return -ENOMEM; retval = -ENOMEM;
goto err_free4;
} }
s->rxstr = kzalloc(sizeof(u8) * MAX3107_RX_FIFO_SIZE, GFP_KERNEL); s->rxstr = kzalloc(sizeof(u8) * MAX3107_RX_FIFO_SIZE, GFP_KERNEL);
if (!s->rxstr) { if (!s->rxstr) {
pr_err("Allocating RX buffer failed\n"); pr_err("Allocating RX buffer failed\n");
return -ENOMEM; retval = -ENOMEM;
goto err_free3;
} }
/* SPI Tx buffer /* SPI Tx buffer
* SPI transfer buffer * SPI transfer buffer
@ -1002,7 +1004,8 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)
s->txbuf = kzalloc(sizeof(u16) * MAX3107_TX_FIFO_SIZE + 3, GFP_KERNEL); s->txbuf = kzalloc(sizeof(u16) * MAX3107_TX_FIFO_SIZE + 3, GFP_KERNEL);
if (!s->txbuf) { if (!s->txbuf) {
pr_err("Allocating TX buffer failed\n"); pr_err("Allocating TX buffer failed\n");
return -ENOMEM; retval = -ENOMEM;
goto err_free2;
} }
/* Initialize shared data lock */ /* Initialize shared data lock */
spin_lock_init(&s->data_lock); spin_lock_init(&s->data_lock);
@ -1021,13 +1024,15 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)
buf[0] = MAX3107_REVID_REG; buf[0] = MAX3107_REVID_REG;
if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) { if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
dev_err(&s->spi->dev, "SPI transfer for REVID read failed\n"); dev_err(&s->spi->dev, "SPI transfer for REVID read failed\n");
return -EIO; retval = -EIO;
goto err_free1;
} }
if ((buf[0] & MAX3107_SPI_RX_DATA_MASK) != MAX3107_REVID1 && if ((buf[0] & MAX3107_SPI_RX_DATA_MASK) != MAX3107_REVID1 &&
(buf[0] & MAX3107_SPI_RX_DATA_MASK) != MAX3107_REVID2) { (buf[0] & MAX3107_SPI_RX_DATA_MASK) != MAX3107_REVID2) {
dev_err(&s->spi->dev, "REVID %x does not match\n", dev_err(&s->spi->dev, "REVID %x does not match\n",
(buf[0] & MAX3107_SPI_RX_DATA_MASK)); (buf[0] & MAX3107_SPI_RX_DATA_MASK));
return -ENODEV; retval = -ENODEV;
goto err_free1;
} }
/* Disable all interrupts */ /* Disable all interrupts */
@ -1047,7 +1052,8 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)
/* Perform SPI transfer */ /* Perform SPI transfer */
if (max3107_rw(s, (u8 *)buf, NULL, 4)) { if (max3107_rw(s, (u8 *)buf, NULL, 4)) {
dev_err(&s->spi->dev, "SPI transfer for init failed\n"); dev_err(&s->spi->dev, "SPI transfer for init failed\n");
return -EIO; retval = -EIO;
goto err_free1;
} }
/* Register UART driver */ /* Register UART driver */
@ -1055,7 +1061,7 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)
retval = uart_register_driver(&max3107_uart_driver); retval = uart_register_driver(&max3107_uart_driver);
if (retval) { if (retval) {
dev_err(&s->spi->dev, "Registering UART driver failed\n"); dev_err(&s->spi->dev, "Registering UART driver failed\n");
return retval; goto err_free1;
} }
driver_registered = 1; driver_registered = 1;
} }
@ -1074,13 +1080,13 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)
retval = uart_add_one_port(&max3107_uart_driver, &s->port); retval = uart_add_one_port(&max3107_uart_driver, &s->port);
if (retval < 0) { if (retval < 0) {
dev_err(&s->spi->dev, "Adding UART port failed\n"); dev_err(&s->spi->dev, "Adding UART port failed\n");
return retval; goto err_free1;
} }
if (pdata->configure) { if (pdata->configure) {
retval = pdata->configure(s); retval = pdata->configure(s);
if (retval < 0) if (retval < 0)
return retval; goto err_free1;
} }
/* Go to suspend mode */ /* Go to suspend mode */
@ -1088,6 +1094,16 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)
pdata->hw_suspend(s, 1); pdata->hw_suspend(s, 1);
return 0; return 0;
err_free1:
kfree(s->txbuf);
err_free2:
kfree(s->rxstr);
err_free3:
kfree(s->rxbuf);
err_free4:
kfree(s);
return retval;
} }
EXPORT_SYMBOL_GPL(max3107_probe); EXPORT_SYMBOL_GPL(max3107_probe);