Commit 2e2bc5a9 authored Jan 22, 2018 by Colin Ian King Committed by Jon Mason Jan 28, 2018

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>

parent 1536dc06

drivers/ntb/test/ntb_tool.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message