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

Commit cddcd800 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

btrfs: Fix kfree of member instead of structure 



Correctness fix: The kfree calls in the add_delayed_* functions free
the node that's passed into it, but the node is a member of another
structure. It works because it's always the first member of the
containing structure, but it should really be using the containing
structure itself.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
parent 43c04fb1

fs/btrfs/delayed-ref.c

+3 −3
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static noinline int add_delayed_ref_head(struct btrfs_fs_info *fs_info, 
		 * we've updated the existing ref, free the newly

		 * allocated ref

		 */

		kfree(ref);

		kfree(head_ref);

	} else {

		delayed_refs->num_heads++;

		delayed_refs->num_heads_ready++;
@@ -549,7 +549,7 @@ static noinline int add_delayed_tree_ref(struct btrfs_fs_info *fs_info, 
		 * we've updated the existing ref, free the newly

		 * allocated ref

		 */

		kfree(ref);

		kfree(full_ref);

	} else {

		delayed_refs->num_entries++;

		trans->delayed_ref_updates++;
@@ -611,7 +611,7 @@ static noinline int add_delayed_data_ref(struct btrfs_fs_info *fs_info, 
		 * we've updated the existing ref, free the newly

		 * allocated ref

		 */

		kfree(ref);

		kfree(full_ref);

	} else {

		delayed_refs->num_entries++;

		trans->delayed_ref_updates++;