diff options
| author | Logan Gunthorpe <logang@deltatee.com> | 2016-06-20 21:15:08 +0200 |
|---|---|---|
| committer | Jon Mason <jdmason@kudzu.us> | 2016-08-05 16:05:31 +0200 |
| commit | 625f0802e84e47760959a5015fdc704d809fd6c8 (patch) | |
| tree | 1c2a3ae29c27bcb9bb5dcae08c1470d3b0d15516 /drivers/ntb | |
| parent | ntb_tool: Fix infinite loop bug when writing spad/peer_spad file (diff) | |
| download | linux-625f0802e84e47760959a5015fdc704d809fd6c8.tar.xz linux-625f0802e84e47760959a5015fdc704d809fd6c8.zip | |
ntb_tool: BUG: Ensure the buffer size is large enough to return all spads
On hardware with 32 scratchpad registers the spad field in ntb tool
could chop off the end. The maximum buffer size is increased from
256 to 15 times the number or scratchpads.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Allen Hubbe <Allen.Hubbe@emc.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/test/ntb_tool.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c index 209ef7ceb98a..a0ead31cd799 100644 --- a/drivers/ntb/test/ntb_tool.c +++ b/drivers/ntb/test/ntb_tool.c @@ -239,7 +239,14 @@ static ssize_t tool_spadfn_read(struct tool_ctx *tc, char __user *ubuf, if (!spad_read_fn) return -EINVAL; - buf_size = min_t(size_t, size, 0x100); + spad_count = ntb_spad_count(tc->ntb); + + /* + * We multiply the number of spads by 15 to get the buffer size + * this is from 3 for the %d, 10 for the largest hex value + * (0x00000000) and 2 for the tab and line feed. + */ + buf_size = min_t(size_t, size, spad_count * 15); buf = kmalloc(buf_size, GFP_KERNEL); if (!buf) @@ -247,7 +254,6 @@ static ssize_t tool_spadfn_read(struct tool_ctx *tc, char __user *ubuf, pos = 0; - spad_count = ntb_spad_count(tc->ntb); for (i = 0; i < spad_count; ++i) { pos += scnprintf(buf + pos, buf_size - pos, "%d\t%#x\n", i, spad_read_fn(tc->ntb, i)); |