* [PATCH][next] NTB: ntb_tool: fix memory leak on 'buf' on error exit path
@ 2018-01-22 9:38 Colin King
2018-01-22 10:02 ` Serge Semin
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2018-01-22 9:38 UTC (permalink / raw)
To: Jon Mason, Dave Jiang, Allen Hubbe, Serge Semin, linux-ntb
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently there is a memory leak on buf when the call to ntb_mw_get_align
fails. Add an exit err label and jump to this so that kfree on buf frees
the memory.
Detected by CoverityScan, CID#1464286 ("Resource leak")
Fixes: d637628ce00c ("NTB: ntb_tool: Add full multi-port NTB API support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/ntb/test/ntb_tool.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
index 920fc9b161b0..d592c0ffbd19 100644
--- a/drivers/ntb/test/ntb_tool.c
+++ b/drivers/ntb/test/ntb_tool.c
@@ -659,7 +659,7 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
&addr_align, &size_align, &size_max);
if (ret)
- return ret;
+ goto err;
off += scnprintf(buf + off, buf_size - off,
"Inbound MW \t%d\n",
@@ -694,6 +694,8 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
&size_max);
ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
+
+err:
kfree(buf);
return ret;
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH][next] NTB: ntb_tool: fix memory leak on 'buf' on error exit path
2018-01-22 9:38 [PATCH][next] NTB: ntb_tool: fix memory leak on 'buf' on error exit path Colin King
@ 2018-01-22 10:02 ` Serge Semin
2018-01-24 4:06 ` Jon Mason
0 siblings, 1 reply; 3+ messages in thread
From: Serge Semin @ 2018-01-22 10:02 UTC (permalink / raw)
To: Colin King
Cc: Jon Mason, Dave Jiang, Allen Hubbe, linux-ntb, kernel-janitors,
linux-kernel
On Mon, Jan 22, 2018 at 09:38:57AM +0000, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently there is a memory leak on buf when the call to ntb_mw_get_align
> fails. Add an exit err label and jump to this so that kfree on buf frees
> the memory.
>
> Detected by CoverityScan, CID#1464286 ("Resource leak")
>
> Fixes: d637628ce00c ("NTB: ntb_tool: Add full multi-port NTB API support")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Good catch, thanks!
Acked-by: Serge Semin <fancer.lancer@gmail.com>
> ---
> drivers/ntb/test/ntb_tool.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
> index 920fc9b161b0..d592c0ffbd19 100644
> --- a/drivers/ntb/test/ntb_tool.c
> +++ b/drivers/ntb/test/ntb_tool.c
> @@ -659,7 +659,7 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
> ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
> &addr_align, &size_align, &size_max);
> if (ret)
> - return ret;
> + goto err;
>
> off += scnprintf(buf + off, buf_size - off,
> "Inbound MW \t%d\n",
> @@ -694,6 +694,8 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
> &size_max);
>
> ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
> +
> +err:
> kfree(buf);
>
> return ret;
> --
> 2.15.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH][next] NTB: ntb_tool: fix memory leak on 'buf' on error exit path
2018-01-22 10:02 ` Serge Semin
@ 2018-01-24 4:06 ` Jon Mason
0 siblings, 0 replies; 3+ messages in thread
From: Jon Mason @ 2018-01-24 4:06 UTC (permalink / raw)
To: Serge Semin
Cc: Colin King, Dave Jiang, Allen Hubbe, linux-ntb, kernel-janitors,
linux-kernel
On Mon, Jan 22, 2018 at 01:02:39PM +0300, Serge Semin wrote:
> On Mon, Jan 22, 2018 at 09:38:57AM +0000, Colin King <colin.king@canonical.com> wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > Currently there is a memory leak on buf when the call to ntb_mw_get_align
> > fails. Add an exit err label and jump to this so that kfree on buf frees
> > the memory.
> >
> > Detected by CoverityScan, CID#1464286 ("Resource leak")
> >
> > Fixes: d637628ce00c ("NTB: ntb_tool: Add full multi-port NTB API support")
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
>
> Good catch, thanks!
>
> Acked-by: Serge Semin <fancer.lancer@gmail.com>
Applied to ntb-next
Thanks,
Jon
>
> > ---
> > drivers/ntb/test/ntb_tool.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
> > index 920fc9b161b0..d592c0ffbd19 100644
> > --- a/drivers/ntb/test/ntb_tool.c
> > +++ b/drivers/ntb/test/ntb_tool.c
> > @@ -659,7 +659,7 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
> > ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
> > &addr_align, &size_align, &size_max);
> > if (ret)
> > - return ret;
> > + goto err;
> >
> > off += scnprintf(buf + off, buf_size - off,
> > "Inbound MW \t%d\n",
> > @@ -694,6 +694,8 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
> > &size_max);
> >
> > ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
> > +
> > +err:
> > kfree(buf);
> >
> > return ret;
> > --
> > 2.15.1
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-24 4:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-22 9:38 [PATCH][next] NTB: ntb_tool: fix memory leak on 'buf' on error exit path Colin King
2018-01-22 10:02 ` Serge Semin
2018-01-24 4:06 ` Jon Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).