Commit 8a3a235b authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman

ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize

commit fcf5ea10 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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6c7308e
...@@ -340,6 +340,8 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, ...@@ -340,6 +340,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)
...@@ -354,6 +356,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, ...@@ -354,6 +356,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment