iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets

Browse Source 
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>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andreas Gruenbacher 2017-09-25 12:23:03 +02:00 committed by Linus Torvalds
parent e365806ac2
commit fc46820b27
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/read_write.c
View File

@ -112,7 +112,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 * 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. * 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; return -ENXIO;
break; break;
case SEEK_HOLE: case SEEK_HOLE:
@ -120,7 +120,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 * 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. * offset isn't i_size or larger, return i_size.
*/ */
if (offset >= eof) if ((unsigned long long)offset >= eof)
return -ENXIO; return -ENXIO;
offset = eof; offset = eof;
break; break;