diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-01-22 09:38:57 +0000 |
|---|---|---|
| committer | Jon Mason <jdmason@kudzu.us> | 2018-01-28 22:17:24 -0500 |
| commit | 2e2bc5a9a300261853303c006b7c29faafc64221 (patch) | |
| tree | 8fd676caf858363541e4d64130bda58c9faa0047 /drivers/ntb | |
| parent | 1536dc063e82090c5da65ddd94b1da1b38bfab43 (diff) | |
| download | lwn-2e2bc5a9a300261853303c006b7c29faafc64221.tar.gz lwn-2e2bc5a9a300261853303c006b7c29faafc64221.zip | |
NTB: ntb_tool: fix memory leak on 'buf' on error exit path
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>
Acked-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/test/ntb_tool.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |