diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2014-06-08 19:04:13 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:01:33 -0700 |
| commit | 64b84ef0258d03d80d2581b7f44b7630e945e612 (patch) | |
| tree | 609b68031a26c53ddf5eff3662bbcb42d6b22624 | |
| parent | 8f1dd63b01d0ab74032c77cad7a664da8a59dc2c (diff) | |
| download | lwn-64b84ef0258d03d80d2581b7f44b7630e945e612.tar.gz lwn-64b84ef0258d03d80d2581b7f44b7630e945e612.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>
| -rw-r--r-- | fs/btrfs/backref.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index bcec06750232..9a6b24a73aae 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -1033,7 +1033,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; } |