diff options
author | Elena Reshetova <elena.reshetova@intel.com> | 2017-03-03 03:55:12 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-04-18 08:07:23 -0400 |
commit | 490b54d6fb75f6ffd0471ec58bb38a992e2b40cd (patch) | |
tree | a7f431ea6a0f4369ba43be8736090efd54d6998b /fs/btrfs/extent_io.c | |
parent | 9b64f57ddf8673d29fafb3405d4aa1e93f5a4cd7 (diff) |
btrfs: convert extent_map.refs from atomic_t to refcount_t
refcount_t type and corresponding API should be
used instead of atomic_t when the variable is used as
a reference counter. This allows to avoid accidental
refcounter overflows that might lead to use-after-free
situations.
Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David Windsor <dwindsor@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r-- | fs/btrfs/extent_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 27fdb250b446..3649932e48d5 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -2859,7 +2859,7 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset, | |||
2859 | em = *em_cached; | 2859 | em = *em_cached; |
2860 | if (extent_map_in_tree(em) && start >= em->start && | 2860 | if (extent_map_in_tree(em) && start >= em->start && |
2861 | start < extent_map_end(em)) { | 2861 | start < extent_map_end(em)) { |
2862 | atomic_inc(&em->refs); | 2862 | refcount_inc(&em->refs); |
2863 | return em; | 2863 | return em; |
2864 | } | 2864 | } |
2865 | 2865 | ||
@@ -2870,7 +2870,7 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset, | |||
2870 | em = get_extent(BTRFS_I(inode), page, pg_offset, start, len, 0); | 2870 | em = get_extent(BTRFS_I(inode), page, pg_offset, start, len, 0); |
2871 | if (em_cached && !IS_ERR_OR_NULL(em)) { | 2871 | if (em_cached && !IS_ERR_OR_NULL(em)) { |
2872 | BUG_ON(*em_cached); | 2872 | BUG_ON(*em_cached); |
2873 | atomic_inc(&em->refs); | 2873 | refcount_inc(&em->refs); |
2874 | *em_cached = em; | 2874 | *em_cached = em; |
2875 | } | 2875 | } |
2876 | return em; | 2876 | return em; |