summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLiu Bo <bo.li.liu@oracle.com>2014-06-08 19:04:13 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-30 20:09:46 -0700
commitd6f5d5fd0c1de1a443e3a9c3d439dd5d760f11cc (patch)
tree694bc64fce322d6c74af2d1e795173582957a9ca /fs
parent2346e1e345bbb141271d0e54d6d906118db8864d (diff)
downloadlinux-3.10-d6f5d5fd0c1de1a443e3a9c3d439dd5d760f11cc.tar.gz
linux-3.10-d6f5d5fd0c1de1a443e3a9c3d439dd5d760f11cc.tar.bz2
linux-3.10-d6f5d5fd0c1de1a443e3a9c3d439dd5d760f11cc.zip
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 <bo.li.liu@oracle.com> Signed-off-by: Chris Mason <clm@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/backref.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 290e347b6db..75386cb004a 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;
}