serial: max3107: Fix memory leaks when returning on error
PATCH 1/1 serial: max3107: Fix memory leaks when returning on error
[PATCH] serial: max3107: Fix memory leaks in max3107_probe() when returning on error.
--- drivers/serial/max3107.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-)
drivers/serial/max3107.c +25 -9
@@ -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 );if (!s->rxbuf) {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 );if (!s->rxstr) {pr_err ("Allocating RX buffer failed\n" ); -return -ENOMEM ; + retval = -ENOMEM ; + goto err_free3; }/* SPI Tx 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 );if (!s->txbuf) {pr_err ("Allocating TX buffer failed\n" ); -return -ENOMEM ; + retval = -ENOMEM ; + goto err_free2; }/* Initialize shared 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 ;if (max3107_rw (s, (u8 *)buf, (u8 *)buf,2 )) {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 && (buf[0 ] &MAX3107_SPI_RX_DATA_MASK ) !=MAX3107_REVID2 ) {dev_err (&s->spi->dev,"REVID %x does not match\n" , (buf[0 ] &MAX3107_SPI_RX_DATA_MASK )); -return -ENODEV ; + retval = -ENODEV ; + goto err_free1; }/* Disable all interrupts */
@@ -1047,7 +1052,8 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)/* Perform SPI transfer */ if (max3107_rw (s, (u8 *)buf,NULL ,4 )) {dev_err (&s->spi->dev,"SPI transfer for init failed\n" ); -return -EIO ; + retval = -EIO ; + goto err_free1; }/* 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);if (retval) {dev_err (&s->spi->dev,"Registering UART driver failed\n" ); -return retval; + goto err_free1; } 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);if (retval <0 ) {dev_err (&s->spi->dev,"Adding UART port failed\n" ); -return retval; + goto err_free1; }if (pdata->configure) { retval = pdata->configure (s);if (retval <0 ) -return retval; + goto err_free1; }/* Go to suspend mode */
@@ -1088,6 +1094,16 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata) pdata->hw_suspend (s,1 );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);
Signature · 1 line
1.7.0.4
Quoted 4 lines · On Mon, 13 Sep 2010 12:08:11 -0400 Davidlohr Bueso <[email protected]> wrote:
[PATCH] serial: max3107: Fix memory leaks in
max3107_probe()when returning on error.Signed-off-by Davidlohr Bueso <[email protected]>
[email protected]
Appliedpatch "serial: max3107: Fix memory leaks when returning on error" added to gregkh-2.6 tree
In reply to Davidlohr BuesoThis is a note to let you know that I've just added the patch titled
serial: max3107: Fix memory leaks when returning on error
to my gregkh-2.6 tree which can be found in directory form at:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
and in git form at:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/patches.git
The filename of this patch is:
serial-max3107-fix-memory-leaks-when-returning-on-error.patch
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
If this patch meets the merge guidelines for a bugfix, it should be merged into Linus's tree before the next major kernel release. If not, it will be merged into Linus's tree during the next merge window.
Either way, you will probably be copied on the patch when it gets sent to Linus for merging so that others can see what is happening in kernel development.
If you have any questions about this process, please let me know.
Quoted 1 line
From [email protected] Tue Sep 21 13:40:18 2010
Subject: serial: max3107: Fix memory leaks when returning on error
From: Davidlohr Bueso <[email protected]>
To: [email protected], [email protected], [email protected]
Cc: [email protected], LKML <[email protected]>
Date: Mon, 13 Sep 2010 12:08:11 -0400
Message-ID: <1284394091.2055.5.camel@cowboy>
Fix memory leaks in max3107_probe() when returning on error.
--- drivers/serial/max3107.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-)
drivers/serial/max3107.c +25 -9
@@ -986,12 +986,14 @@ int max3107_probe(struct spi_device *spi s->rxbuf =kzalloc (sizeof (u16) * (MAX3107_RX_FIFO_SIZE +2 ),GFP_KERNEL );if (!s->rxbuf) {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 );if (!s->rxstr) {pr_err ("Allocating RX buffer failed\n" ); -return -ENOMEM ; + retval = -ENOMEM ; + goto err_free3; }/* SPI Tx buffer * SPI transfer buffer
@@ -1002,7 +1004,8 @@ int max3107_probe(struct spi_device *spi s->txbuf =kzalloc (sizeof (u16) *MAX3107_TX_FIFO_SIZE +3 ,GFP_KERNEL );if (!s->txbuf) {pr_err ("Allocating TX buffer failed\n" ); -return -ENOMEM ; + retval = -ENOMEM ; + goto err_free2; }/* Initialize shared data lock */ spin_lock_init (&s->data_lock);
@@ -1021,13 +1024,15 @@ int max3107_probe(struct spi_device *spi buf[0 ] =MAX3107_REVID_REG ;if (max3107_rw (s, (u8 *)buf, (u8 *)buf,2 )) {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 && (buf[0 ] &MAX3107_SPI_RX_DATA_MASK ) !=MAX3107_REVID2 ) {dev_err (&s->spi->dev,"REVID %x does not match\n" , (buf[0 ] &MAX3107_SPI_RX_DATA_MASK )); -return -ENODEV ; + retval = -ENODEV ; + goto err_free1; }/* Disable all interrupts */
@@ -1047,7 +1052,8 @@ int max3107_probe(struct spi_device *spi/* Perform SPI transfer */ if (max3107_rw (s, (u8 *)buf,NULL ,4 )) {dev_err (&s->spi->dev,"SPI transfer for init failed\n" ); -return -EIO ; + retval = -EIO ; + goto err_free1; }/* Register UART driver */
@@ -1055,7 +1061,7 @@ int max3107_probe(struct spi_device *spi retval =uart_register_driver (&max3107_uart_driver);if (retval) {dev_err (&s->spi->dev,"Registering UART driver failed\n" ); -return retval; + goto err_free1; } driver_registered =1 ; }
@@ -1074,13 +1080,13 @@ int max3107_probe(struct spi_device *spi retval =uart_add_one_port (&max3107_uart_driver, &s->port);if (retval <0 ) {dev_err (&s->spi->dev,"Adding UART port failed\n" ); -return retval; + goto err_free1; }if (pdata->configure) { retval = pdata->configure (s);if (retval <0 ) -return retval; + goto err_free1; }/* Go to suspend mode */
@@ -1088,6 +1094,16 @@ int max3107_probe(struct spi_device *spi pdata->hw_suspend (s,1 );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);