From: Hu Weiwen <sehuww@mail.scut.edu.cn>
To: hsiangkao@redhat.com
Cc: linux-erofs@lists.ozlabs.org
Subject: [PATCH v2] erofs-utils: fuse: fix random readlink error
Date: Sat, 30 Jan 2021 02:07:47 +0800 [thread overview]
Message-ID: <20210129180747.67731-1-sehuww@mail.scut.edu.cn> (raw)
In-Reply-To: <20210123152213.GB3167351@xiangao.remote.csb>
readlink should fill a **null-terminated** string in the buffer.
To achieve this:
1) memset(0) for unmapped extents;
2) make erofsfuse_read() properly returning the actual bytes read;
3) insert a null character if the path is truncated.
Link: https://lore.kernel.org/r/20210121101233.GC6680@DESKTOP-N4CECTO.huww98.cn
Signed-off-by: Hu Weiwen <sehuww@mail.scut.edu.cn>
---
fuse/main.c | 8 ++++++++
lib/data.c | 6 ++++++
2 files changed, 14 insertions(+)
diff --git a/fuse/main.c b/fuse/main.c
index c162912..70558b0 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -74,6 +74,10 @@ static int erofsfuse_read(const char *path, char *buffer,
ret = erofs_pread(&vi, buffer, size, offset);
if (ret)
return ret;
+ if (offset + size > vi.i_size)
+ return vi.i_size - offset;
+ if (offset >= vi.i_size)
+ return 0;
return size;
}
@@ -83,6 +87,10 @@ static int erofsfuse_readlink(const char *path, char *buffer, size_t size)
if (ret < 0)
return ret;
+ DBG_BUGON(ret > size);
+ if (ret == size)
+ buffer[size - 1] = '\0';
+ erofs_dbg("readlink result %s", buffer);
return 0;
}
diff --git a/lib/data.c b/lib/data.c
index 3781846..3641536 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -29,6 +29,7 @@ static int erofs_map_blocks_flatmode(struct erofs_inode *inode,
if (offset >= inode->i_size) {
/* leave out-of-bound access unmapped */
map->m_flags = 0;
+ map->m_plen = 0;
goto out;
}
@@ -91,9 +92,13 @@ static int erofs_read_raw_data(struct erofs_inode *inode, char *buffer,
if (!(map.m_flags & EROFS_MAP_MAPPED)) {
if (!map.m_llen) {
+ /* reached EOF */
+ memset(buffer + ptr - offset, 0,
+ offset + size - ptr);
ptr = offset + size;
continue;
}
+ memset(buffer + map.m_la - offset, 0, map.m_llen);
ptr = map.m_la + map.m_llen;
continue;
}
@@ -138,6 +143,7 @@ static int z_erofs_read_data(struct erofs_inode *inode, char *buffer,
return ret;
if (!(map.m_flags & EROFS_MAP_MAPPED)) {
+ memset(buffer + map.m_la - offset, 0, map.m_llen);
end = map.m_la;
continue;
}
--
2.25.1
next prev parent reply other threads:[~2021-01-29 18:09 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 ` [PATCH] erofs-utils: fuse: fix random readlink error Hu Weiwen
2021-01-22 0:34 ` 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 ` Hu Weiwen [this message]
2021-02-09 19:38 ` [PATCH v2] " 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=20210129180747.67731-1-sehuww@mail.scut.edu.cn \
--to=sehuww@mail.scut.edu.cn \
--cc=hsiangkao@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).