From: Liu Bo Date: Sun, 8 Jun 2014 11:04:13 +0000 (+0800) Subject: Btrfs: use right type to get real comparison X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d6f5d5fd0c1de1a443e3a9c3d439dd5d760f11cc;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Btrfs: use right type to get real comparison commit cd857dd6bc2ae9ecea14e75a34e8a8fdc158e307 upstream. We want to make sure the point is still within the extent item, not to verify the memory it's pointing to. Signed-off-by: Liu Bo Signed-off-by: Chris Mason Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 290e347b6db3..75386cb004af 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -1366,7 +1366,7 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb, *out_eiref = (struct btrfs_extent_inline_ref *)(ei + 1); } *ptr = (unsigned long)*out_eiref; - if ((void *)*ptr >= (void *)ei + item_size) + if ((unsigned long)(*ptr) >= (unsigned long)ei + item_size) return -ENOENT; }