Skip to content

Commit

Permalink
btrfs: incorrect handling for fiemap_fill_next_extent return
Browse files Browse the repository at this point in the history
commit 26e726a upstream.

fiemap_fill_next_extent returns 0 on success, -errno on error, 1 if this was
the last extent that will fit in user array. If 1 is returned, the return
value may eventually returned to user space, which should not happen, according
to manpage of ioctl.

Signed-off-by: Chengyu Song <csong84@gatech.edu>
Reviewed-by: David Sterba <dsterba@suse.cz>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Chengyu Song authored and Greg Kroah-Hartman committed Jun 22, 2015
1 parent 98d94f2 commit 8d1529c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -4080,8 +4080,11 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
}
ret = fiemap_fill_next_extent(fieinfo, em_start, disko,
em_len, flags);
if (ret)
if (ret) {
if (ret == 1)
ret = 0;
goto out_free;
}
}
out_free:
free_extent_map(em);
Expand Down

0 comments on commit 8d1529c

Please sign in to comment.