From: Zorro Lang <zlang@redhat.com>
To: fstests@vger.kernel.org
Subject: [PATCH v2] fsstress: avoid infinite zero byte reading
Date: Sat, 16 Feb 2019 15:25:40 +0800 [thread overview]
Message-ID: <20190216072540.26272-1-zlang@redhat.com> (raw)
copyrange_f and splice_f functions use a while loop to read a file,
it's fine if there's only one fsstress process(and its children),
but if some third part testing processes remove the file in the
middle phase of copyrange_f running, copyrange_f maybe always return
0, and the while loop can't be end. As below:
root 47184 xxxxxx S+ ./fsstress -R -d /mnt/scratch -n 10000 -p 20 -v
root 47187 xxxxxx R+ ./fsstress -d /mnt/scratch -n 10000 -p 20 -v
root 47199 xxxxxx R+ ./fsstress -d /mnt/scratch -n 10000 -p 20 -v
root 47314 xxxxxx S+ grep --color=auto fsstress
...
...
copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0
copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0
copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0
copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0
...
...
lr-x------. 1 root root 64 Jan 28 11:34 /proc/47187/fd/3 -> '/mnt/scratch/p2/f2 (deleted)'
Signed-off-by: Zorro Lang <zlang@redhat.com>
---
V2 remove 300 times loop, just return if get ret == 0
Thanks,
Zorro
ltp/fsstress.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 25e0c3e2..138f7ecf 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -2363,7 +2363,7 @@ copyrange_f(
int v2;
int fd1;
int fd2;
- size_t ret;
+ size_t ret = 0;
int e;
/* Load paths */
@@ -2452,7 +2452,7 @@ copyrange_f(
if (ret < 0) {
if (errno != EAGAIN || tries++ >= 300)
break;
- } else if (ret > len)
+ } else if (ret > len || ret == 0)
break;
else if (ret > 0)
len -= ret;
@@ -2908,6 +2908,9 @@ splice_f(int opno, long r)
len -= ret1;
total += ret1;
+ if (ret1 == 0) {
+ break;
+ }
}
if (ret1 < 0 || ret2 < 0)
--
2.17.2
next reply other threads:[~2019-02-16 7:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-16 7:25 Zorro Lang [this message]
2019-02-17 22:14 ` [PATCH v2] fsstress: avoid infinite zero byte reading Dave Chinner
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=20190216072540.26272-1-zlang@redhat.com \
--to=zlang@redhat.com \
--cc=fstests@vger.kernel.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