From: Andreas Gruenbacher Date: Tue, 22 Aug 2017 15:01:30 +0000 (-0500) Subject: xfs_io: add seek consistency checks X-Git-Tag: v4.13.0-rc1~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=866d7fcb27924744fa86e07105fbeac34cc2f92c;p=thirdparty%2Fxfsprogs-dev.git xfs_io: add seek consistency checks When seeking for data and holes, the lseek result must be greater than or equal to the start offset. Furthermore, assuming that the file doesn't change under us, when switching between SEEK_HOLE and SEEK_DATA, the seek position must increase monotonically. Warn and abort if this is not the case. Signed-off-by: Andreas Gruenbacher Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/io/seek.c b/io/seek.c index d06375dc1..871b47262 100644 --- a/io/seek.c +++ b/io/seek.c @@ -147,7 +147,10 @@ seek_f( * decide if we want to display that type of entry. */ if (flag & SEEK_HFLAG) { + current = HOLE; offset = lseek(file->fd, start, SEEK_HOLE); + if (offset != -1 && offset < start) + goto bad_result; if ((start == offset) || !(flag & SEEK_DFLAG)) { /* * this offset is a hole or are only displaying holes. @@ -155,7 +158,6 @@ seek_f( * data, then we will fall through below to * initialize the data search. */ - current = HOLE; goto found_hole; } } @@ -163,6 +165,8 @@ seek_f( /* The offset is not a hole, or we are looking just for data */ current = DATA; offset = lseek(file->fd, start, SEEK_DATA); + if (offset != -1 && offset < start) + goto bad_result; found_hole: /* @@ -203,8 +207,15 @@ found_hole: current ^= 1; /* alternate between data and hole */ start = offset; offset = lseek(file->fd, start, seekinfo[current].seektype); + if (offset != -1 && offset <= start) + goto bad_result; } return 0; + +bad_result: + fprintf(stderr, "Invalid seek result: lseek(, %lld, SEEK_%s) = %lld\n", + (long long)start, seekinfo[current].name, (long long)offset); + return 0; } void