Skip to content

Commit 45e1058

Browse files
Dan Carpenterjonmason
authored andcommitted
NTB: ntb_tool: uninitialized heap data in tool_fn_write()
The call to: ret = simple_write_to_buffer(buf, size, offp, ubuf, size); will return success if it is able to write even one byte to "buf". The value of "*offp" controls which byte. This could result in reading uninitialized data when we do the sscanf() on the next line. This code is not really desigined to handle partial writes where *offp is non-zero and the "buf" is preserved and re-used between writes. Just ban partial writes and replace the simple_write_to_buffer() with copy_from_user(). Fixes: 578b881 ("NTB: Add tool test client") Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Jon Mason <[email protected]>
1 parent a44252d commit 45e1058

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/ntb/test/ntb_tool.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,16 @@ static ssize_t tool_fn_write(struct tool_ctx *tc,
367367
u64 bits;
368368
int n;
369369

370+
if (*offp)
371+
return 0;
372+
370373
buf = kmalloc(size + 1, GFP_KERNEL);
371374
if (!buf)
372375
return -ENOMEM;
373376

374-
ret = simple_write_to_buffer(buf, size, offp, ubuf, size);
375-
if (ret < 0) {
377+
if (copy_from_user(buf, ubuf, size)) {
376378
kfree(buf);
377-
return ret;
379+
return -EFAULT;
378380
}
379381

380382
buf[size] = 0;

0 commit comments

Comments
 (0)