From: Zorro Lang Date: Sat, 16 Feb 2019 07:25:40 +0000 (+0800) Subject: fsstress: avoid infinite zero byte reading X-Git-Tag: v2022.05.01~1254 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ee89eea1cb948271f51ed319257296ced2652bd;p=xfstests-dev.git fsstress: avoid infinite zero byte reading 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 25e0c3e2..2223fd7d 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; @@ -2890,7 +2890,7 @@ splice_f(int opno, long r) while (len > 0) { /* move to pipe buffer */ ret1 = splice(fd1, &off1, filedes[1], NULL, len, 0); - if (ret1 < 0) { + if (ret1 <= 0) { break; } bytes = ret1;