From: Hu Weiwen <sehuww@mail.scut.edu.cn>
To: linux-erofs@lists.ozlabs.org
Subject: [PATCH] erofs-utils: fuse: fix random readlink error
Date: Fri, 22 Jan 2021 00:31:43 +0800 [thread overview]
Message-ID: <20210121163143.9481-1-sehuww@mail.scut.edu.cn> (raw)
In-Reply-To: <20210121112702.GA2918836@xiangao.remote.csb>
readlink should fill a **null terminated** string in buffer.
Also, read should return number of bytes remaining on EOF.
Link: https://lore.kernel.org/linux-erofs/20210121101233.GC6680@DESKTOP-N4CECTO.huww98.cn/
Signed-off-by: Hu Weiwen <sehuww@mail.scut.edu.cn>
---
fuse/main.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/fuse/main.c b/fuse/main.c
index c162912..bc1e496 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -71,6 +71,12 @@ static int erofsfuse_read(const char *path, char *buffer,
if (ret)
return ret;
+ if (offset >= vi.i_size)
+ return 0;
+
+ if (offset + size > vi.i_size)
+ size = vi.i_size - offset;
+
ret = erofs_pread(&vi, buffer, size, offset);
if (ret)
return ret;
@@ -79,10 +85,16 @@ static int erofsfuse_read(const char *path, char *buffer,
static int erofsfuse_readlink(const char *path, char *buffer, size_t size)
{
- int ret = erofsfuse_read(path, buffer, size, 0, NULL);
+ int ret;
+ size_t path_len;
+
+ erofs_dbg("path:%s size=%zd", path, size);
+ ret = erofsfuse_read(path, buffer, size, 0, NULL);
if (ret < 0)
return ret;
+ path_len = min(size - 1, (size_t)ret);
+ buffer[path_len] = '\0';
return 0;
}
--
2.30.0
next prev parent reply other threads:[~2021-01-21 16:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 10:12 fuse returns ENOENT to openat() for symlink probabilistically 胡玮文
2021-01-21 11:27 ` Gao Xiang
2021-01-21 16:31 ` Hu Weiwen [this message]
2021-01-22 0:34 ` [PATCH] erofs-utils: fuse: fix random readlink error Gao Xiang
2021-01-22 1:00 ` 胡玮文
2021-01-22 1:49 ` Gao Xiang
2021-01-23 13:18 ` 胡玮文
2021-01-23 15:22 ` Gao Xiang
2021-01-23 15:36 ` Gao Xiang
2021-01-29 18:07 ` [PATCH v2] " Hu Weiwen
2021-02-09 19:38 ` Gao Xiang via Linux-erofs
2021-02-13 14:36 ` [PATCH v3] " 胡玮文
2021-02-28 13:30 ` [PATCH v2] " Li GuiFu via Linux-erofs
2021-02-28 13:53 ` [PATCH v4] " Gao Xiang via Linux-erofs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210121163143.9481-1-sehuww@mail.scut.edu.cn \
--to=sehuww@mail.scut.edu.cn \
--cc=linux-erofs@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.