]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
btrfs: fix wrong file range cleanup after an error filling dealloc range
authorFilipe Manana <fdmanana@suse.com>
Wed, 27 May 2020 10:15:53 +0000 (11:15 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:32:55 +0000 (09:32 +0200)
commit e2c8e92d1140754073ad3799eb6620c76bab2078 upstream.

If an error happens while running dellaloc in COW mode for a range, we can
end up calling extent_clear_unlock_delalloc() for a range that goes beyond
our range's end offset by 1 byte, which affects 1 extra page. This results
in clearing bits and doing page operations (such as a page unlock) outside
our target range.

Fix that by calling extent_clear_unlock_delalloc() with an inclusive end
offset, instead of an exclusive end offset, at cow_file_range().

Fixes: a315e68f6e8b30 ("Btrfs: fix invalid attempt to free reserved space on failure to cow range")
CC: stable@vger.kernel.org # 4.14+
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/inode.c

index b628c319a5b65fd75ea2a07a2386602e069ab742..04c477915f6890c6d267af26d19ea4b5734398a8 100644 (file)
@@ -1142,7 +1142,7 @@ out_unlock:
         */
        if (extent_reserved) {
                extent_clear_unlock_delalloc(inode, start,
-                                            start + cur_alloc_size,
+                                            start + cur_alloc_size - 1,
                                             locked_page,
                                             clear_bits,
                                             page_ops);