Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e1cd766 authored by Yan's avatar Yan Committed by Chris Mason
Browse files

Btrfs: Fix double free and off by one in inode.c 



The first change removes  potential double free, the second fix a off
by one error.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent bab9fb03

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ void btrfs_read_locked_inode(struct inode *inode) 
	memcpy(&location, &BTRFS_I(inode)->location, sizeof(location));

	ret = btrfs_lookup_inode(NULL, root, path, &location, 0);

	if (ret) {

		btrfs_free_path(path);

		goto make_bad;

	}

	inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
@@ -1536,7 +1535,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page, 
		flush_dcache_page(result->b_page);

		kunmap(page);

		set_extent_uptodate(em_tree, extent_start,

				    extent_end, GFP_NOFS);

				    extent_end - 1, GFP_NOFS);

		goto insert;

	} else {

		printk("unkknown found_type %d\n", found_type);