evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize

Browse source 
commit fcf5ea10992fbac3c7473a1db33d56a139333cd1 upstream.

ext4_find_unwritten_pgoff() does not properly handle a situation when
starting index is in the middle of a page and blocksize < pagesize. The
following command shows the bug on filesystem with 1k blocksize:

  xfs_io -f -c "falloc 0 4k" \
            -c "pwrite 1k 1k" \
            -c "pwrite 3k 1k" \
            -c "seek -a -r 0" foo

In this example, neither lseek(fd, 1024, SEEK_HOLE) nor lseek(fd, 2048,
SEEK_DATA) will return the correct result.

Fix the problem by neglecting buffers in a page before starting offset.

Reported-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jan Kara 2017-08-05 17:43:24 -04:00 • committed by Greg Kroah-Hartman
parent 12f60018f6
commit bad9f6142c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/ext4/file.c
View file

@ -500,6 +500,8 @@ static int ext4_find_unwritten_pgoff(struct inode *inode,
lastoff = page_offset(page); lastoff = page_offset(page);
bh = head = page_buffers(page); bh = head = page_buffers(page);
do { do {
if (lastoff + bh->b_size <= startoff)
goto next;
if (buffer_uptodate(bh) || if (buffer_uptodate(bh) ||
buffer_unwritten(bh)) { buffer_unwritten(bh)) {
if (whence == SEEK_DATA) if (whence == SEEK_DATA)
@ -514,6 +516,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode,
unlock_page(page); unlock_page(page);
goto out; goto out;
} }
next:
lastoff += bh->b_size; lastoff += bh->b_size;
bh = bh->b_this_page; bh = bh->b_this_page;
} while (bh != head); } while (bh != head);