public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Eryu Guan <eguan@linux.alibaba.com>
To: fstests@vger.kernel.org
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>,
	Eryu Guan <eguan@linux.alibaba.com>
Subject: [PATCH] ltp/fsx: avoid infinite loop while finding offset2 in clone/dedupe/copy range ops
Date: Fri, 23 Aug 2019 15:22:59 +0800	[thread overview]
Message-ID: <20190823072259.56671-1-eguan@linux.alibaba.com> (raw)

In CLONE/DEDUPE/COPY RANGE operations, we pick a "offset" and "size"
first, then find a suitable "offset2" by looping if there's overlap
(|offset2-offset| < size) or final file size is greater than max file
size (offset2 + size > maxfilelen).

But it's possible that there's no such suitable offset2 and we loop
forever. e.g. block_size = 4096, offset = 0, size = 4096 and maxfilelen
is a value smaller than 8212 (which could be set via '-l' option).

Fix it by making sure maxfilelen/file_size is big enough to hold 'size'
bytes from 'offset2', and just skip this operation if not.

Signed-off-by: Eryu Guan <eguan@linux.alibaba.com>
---
 ltp/fsx.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ltp/fsx.c b/ltp/fsx.c
index 06d08e4e93f3..f6eb3308e8bc 100644
--- a/ltp/fsx.c
+++ b/ltp/fsx.c
@@ -1825,6 +1825,14 @@ do {						\
 	TRIM_LEN(off, len, size);		\
 } while (0)
 
+#define CHECK_RANGE(off, len, size)		\
+do {						\
+	if ((off + len * 2) > size) {		\
+		log5(op, offset, size, -1, FL_SKIPPED); \
+		goto out;			\
+	}					\
+} while (0)
+
 void
 cleanup(int sig)
 {
@@ -1989,6 +1997,7 @@ test(void)
 		TRIM_OFF_LEN(offset, size, file_size);
 		offset = offset & ~(block_size - 1);
 		size = size & ~(block_size - 1);
+		CHECK_RANGE(offset, size, maxfilelen);
 		do {
 			offset2 = random();
 			TRIM_OFF(offset2, maxfilelen);
@@ -2003,6 +2012,7 @@ test(void)
 			TRIM_OFF_LEN(offset, size, file_size);
 			offset = offset & ~(block_size - 1);
 			size = size & ~(block_size - 1);
+			CHECK_RANGE(offset, size, file_size);
 			do {
 				if (tries++ >= 30) {
 					size = 0;
@@ -2020,6 +2030,7 @@ test(void)
 		offset -= offset % readbdy;
 		if (o_direct)
 			size -= size % readbdy;
+		CHECK_RANGE(offset, size, maxfilelen);
 		do {
 			offset2 = random();
 			TRIM_OFF(offset2, maxfilelen);
-- 
2.14.4.44.g2045bb6

             reply	other threads:[~2019-08-23  7:24 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-23  7:22 Eryu Guan [this message]
2019-08-23  7:27 ` [PATCH] ltp/fsx: avoid infinite loop while finding offset2 in clone/dedupe/copy range ops Eryu Guan
2019-08-23 14:33 ` Darrick J. Wong
2019-08-24  1:07   ` Eryu Guan

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=20190823072259.56671-1-eguan@linux.alibaba.com \
    --to=eguan@linux.alibaba.com \
    --cc=darrick.wong@oracle.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