Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753262AbbETLZ4 (ORCPT ); Wed, 20 May 2015 07:25:56 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:14365 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbbETLZv (ORCPT ); Wed, 20 May 2015 07:25:51 -0400 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Wed, 20 May 2015 04:23:52 -0700 Message-ID: <555C6F38.50603@nvidia.com> Date: Wed, 20 May 2015 12:25:44 +0100 From: Jon Hunter User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Alexandre Courbot , Laxman Dewangan , Greg Kroah-Hartman , "Jiri Slaby" CC: , , Subject: Re: [PATCH] serial: tegra: Fix memory leak on DMA setup failure References: <1432120864-23916-1-git-send-email-jonathanh@nvidia.com> In-Reply-To: <1432120864-23916-1-git-send-email-jonathanh@nvidia.com> X-Originating-IP: [10.21.134.107] X-ClientProxiedBy: UKMAIL101.nvidia.com (10.26.138.13) To UKMAIL101.nvidia.com (10.26.138.13) Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2989 Lines: 91 On 20/05/15 12:21, Jon Hunter wrote: > If the call to dmaengine_slave_config() fails, then the DMA buffer will > not be freed/unmapped. Fix this by moving the code that stores the > address of the buffer in the tegra_uart_port structure to before the > call to dmaengine_slave_config(). By the way, just to be clear, I did try to fix this before [1], but failed :-( Thanks to Alex for pointing this out. Cheers Jon [1] https://lkml.org/lkml/2015/5/5/802 > Reported-by: Alexandre Courbot > Signed-off-by: Jon Hunter > --- > drivers/tty/serial/serial-tegra.c | 32 +++++++++++--------------------- > 1 file changed, 11 insertions(+), 21 deletions(-) > > diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c > index 3b63f103f0c9..cf0133ae762d 100644 > --- a/drivers/tty/serial/serial-tegra.c > +++ b/drivers/tty/serial/serial-tegra.c > @@ -999,6 +999,12 @@ static int tegra_uart_dma_channel_allocate(struct tegra_uart_port *tup, > dma_release_channel(dma_chan); > return -ENOMEM; > } > + dma_sconfig.src_addr = tup->uport.mapbase; > + dma_sconfig.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; > + dma_sconfig.src_maxburst = 4; > + tup->rx_dma_chan = dma_chan; > + tup->rx_dma_buf_virt = dma_buf; > + tup->rx_dma_buf_phys = dma_phys; > } else { > dma_phys = dma_map_single(tup->uport.dev, > tup->uport.state->xmit.buf, UART_XMIT_SIZE, > @@ -1009,39 +1015,23 @@ static int tegra_uart_dma_channel_allocate(struct tegra_uart_port *tup, > return -ENOMEM; > } > dma_buf = tup->uport.state->xmit.buf; > - } > - > - if (dma_to_memory) { > - dma_sconfig.src_addr = tup->uport.mapbase; > - dma_sconfig.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; > - dma_sconfig.src_maxburst = 4; > - } else { > dma_sconfig.dst_addr = tup->uport.mapbase; > dma_sconfig.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; > dma_sconfig.dst_maxburst = 16; > + tup->tx_dma_chan = dma_chan; > + tup->tx_dma_buf_virt = dma_buf; > + tup->tx_dma_buf_phys = dma_phys; > } > > ret = dmaengine_slave_config(dma_chan, &dma_sconfig); > if (ret < 0) { > dev_err(tup->uport.dev, > "Dma slave config failed, err = %d\n", ret); > - goto scrub; > + tegra_uart_dma_channel_free(tup, dma_to_memory); > + return ret; > } > > - if (dma_to_memory) { > - tup->rx_dma_chan = dma_chan; > - tup->rx_dma_buf_virt = dma_buf; > - tup->rx_dma_buf_phys = dma_phys; > - } else { > - tup->tx_dma_chan = dma_chan; > - tup->tx_dma_buf_virt = dma_buf; > - tup->tx_dma_buf_phys = dma_phys; > - } > return 0; > - > -scrub: > - tegra_uart_dma_channel_free(tup, dma_to_memory); > - return ret; > } > > static int tegra_uart_startup(struct uart_port *u) > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/