diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2017-08-24 13:22:06 -0400 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-11-06 15:28:49 +0100 |
| commit | b9700d07f1eb3e5b35174d7dcef451d806993230 (patch) | |
| tree | bd1b6b94607a15ad16dc25a33b75a472f0c09458 /fs | |
| parent | a2040bc70a535eb3efc973decf6a89f01e5c8739 (diff) | |
| download | android_kernel_m2note-b9700d07f1eb3e5b35174d7dcef451d806993230.tar.gz | |
ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets
commit 1bd8d6cd3e413d64e543ec3e69ff43e75a1cf1ea upstream.
In the ext4 implementations of SEEK_HOLE and SEEK_DATA, make sure we
return -ENXIO for negative offsets instead of banging around inside
the extent code and returning -EFSCORRUPTED.
Reported-by: Mateusz S <muttdini@gmail.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org # 4.6
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index b5ce93d2c..c8197c41e 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -585,7 +585,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) mutex_lock(&inode->i_mutex); isize = i_size_read(inode); - if (offset >= isize) { + if (offset < 0 || offset >= isize) { mutex_unlock(&inode->i_mutex); return -ENXIO; } @@ -658,7 +658,7 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize) mutex_lock(&inode->i_mutex); isize = i_size_read(inode); - if (offset >= isize) { + if (offset < 0 || offset >= isize) { mutex_unlock(&inode->i_mutex); return -ENXIO; } |