Commit f3e2e7f0 authored Sep 25, 2017 by Andreas Gruenbacher Committed by Greg Kroah-Hartman Oct 05, 2017

vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets



commit fc46820b27a2d9a46f7e90c9ceb4a64a1bc5fab8 upstream.

In generic_file_llseek_size, return -ENXIO for negative offsets as well
as offsets beyond EOF.  This affects filesystems which don't implement
SEEK_HOLE / SEEK_DATA internally, possibly because they don't support
holes.

Fixes xfstest generic/448.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 18a89a10

fs/read_write.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,
		* In the generic case the entire file is data, so as long as
		* offset isn't at the end of the file then the offset is data.
		*/
		if (offset >= eof)
		if ((unsigned long long)offset >= eof)
		return -ENXIO;
		break;
		case SEEK_HOLE:
		@@ -122,7 +122,7 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,
		* There is a virtual hole at the end of the file, so as long as
		* offset isn't i_size or larger, return i_size.
		*/
		if (offset >= eof)
		if ((unsigned long long)offset >= eof)
		return -ENXIO;
		offset = eof;
		break;