diff options
| author | Logan Gunthorpe <logang@deltatee.com> | 2019-01-09 12:22:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-25 15:33:03 +0200 |
| commit | fff524946f93f675ffc5f75f042be5e51c25b596 (patch) | |
| tree | e6921e0c1b010130f10767e0814241a62fcf74fc | |
| parent | 03a8dbf4f7386d5ce84c3633351e89d918a8ab81 (diff) | |
| download | linux-stable-fff524946f93f675ffc5f75f042be5e51c25b596.tar.gz linux-stable-fff524946f93f675ffc5f75f042be5e51c25b596.tar.bz2 linux-stable-fff524946f93f675ffc5f75f042be5e51c25b596.zip | |
NTB: ntb_tool: reading the link file should not end in a NULL byte
[ Upstream commit 912e12813dd03c602e4922fc34709ec4d4380cf0 ]
When running ntb_test this warning is issued:
./ntb_test.sh: line 200: warning: command substitution: ignored null
byte in input
This is caused by the kernel returning one more byte than is necessary
when reading the link file.
Reduce the number of bytes read back to 2 as it was before the
commit that regressed this.
Fixes: 7f46c8b3a552 ("NTB: ntb_tool: Add full multi-port NTB API support")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Allen Hubbe <allenbh@gmail.com>
Tested-by: Alexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/ntb/test/ntb_tool.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c index 025747c1568e..311d6ab8d016 100644 --- a/drivers/ntb/test/ntb_tool.c +++ b/drivers/ntb/test/ntb_tool.c @@ -504,7 +504,7 @@ static ssize_t tool_peer_link_read(struct file *filep, char __user *ubuf, buf[1] = '\n'; buf[2] = '\0'; - return simple_read_from_buffer(ubuf, size, offp, buf, 3); + return simple_read_from_buffer(ubuf, size, offp, buf, 2); } static TOOL_FOPS_RDWR(tool_peer_link_fops, @@ -1690,4 +1690,3 @@ static void __exit tool_exit(void) debugfs_remove_recursive(tool_dbgfs_topdir); } module_exit(tool_exit); - |