diff options
author | Josef Bacik <jbacik@fusionio.com> | 2013-01-30 14:31:31 -0500 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-02-05 16:09:16 -0500 |
commit | 59fe4f41976f6331b695ff049296d082cf621823 (patch) | |
tree | 8d85984a12d0a821a402f83558e82561485be65b /fs | |
parent | 5d1f40202bad12d4c70a2d40a420b30d23a72b1a (diff) | |
download | linux-3.10-59fe4f41976f6331b695ff049296d082cf621823.tar.gz linux-3.10-59fe4f41976f6331b695ff049296d082cf621823.tar.bz2 linux-3.10-59fe4f41976f6331b695ff049296d082cf621823.zip |
Btrfs: fix possible stale data exposure
We specifically do not update the disk i_size if there are ordered extents
outstanding for any area between the current disk_i_size and our ordered
extent so that we do not expose stale data. The problem is the check we
have only checks if the ordered extent starts at or after the current
disk_i_size, which doesn't take into account an ordered extent that starts
before the current disk_i_size and ends past the disk_i_size. Fix this by
checking if the extent ends past the disk_i_size. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/ordered-data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index fc6840b53d9..e5ed5672960 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -877,7 +877,7 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset, break; if (test->file_offset >= i_size) break; - if (test->file_offset >= disk_i_size) { + if (entry_end(test) > disk_i_size) { /* * we don't update disk_i_size now, so record this * undealt i_size. Or we will not know the real |