Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a52f4cd2 authored by Liu Bo's avatar Liu Bo Committed by Josef Bacik
Browse files

Btrfs: fix off-by-one in fiemap 



lock_extent/unlock_extent expect an exclusive end.

Tested-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 60b62978

fs/btrfs/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -3989,7 +3989,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
		last_for_get_extent = isize;

	}



	lock_extent_bits(&BTRFS_I(inode)->io_tree, start, start + len, 0,

	lock_extent_bits(&BTRFS_I(inode)->io_tree, start, start + len - 1, 0,

			 &cached_state);



	em = get_extent_skip_holes(inode, start, last_for_get_extent,
@@ -4076,7 +4076,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
out_free:

	free_extent_map(em);

out:

	unlock_extent_cached(&BTRFS_I(inode)->io_tree, start, start + len,

	unlock_extent_cached(&BTRFS_I(inode)->io_tree, start, start + len - 1,

			     &cached_state, GFP_NOFS);

	return ret;

}