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

Commit 905386f8 authored by Joe Thornber's avatar Joe Thornber Committed by Alasdair G Kergon
Browse files

dm thin: fix memory leak in process_prepared_mapping error paths 



Fix memory leak in process_prepared_mapping by always freeing
the dm_thin_new_mapping structs from the mapping_pool mempool on
the error paths.

Signed-off-by: default avatarJoe Thornber <ejt@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent c66029f4

drivers/md/dm-thin.c

+3 −2
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static void process_prepared_mapping(struct dm_thin_new_mapping *m) 


	if (m->err) {

		cell_error(m->cell);

		return;

		goto out;

	}



	/*
@@ -882,7 +882,7 @@ static void process_prepared_mapping(struct dm_thin_new_mapping *m) 
	if (r) {

		DMERR("dm_thin_insert_block() failed");

		cell_error(m->cell);

		return;

		goto out;

	}



	/*
@@ -897,6 +897,7 @@ static void process_prepared_mapping(struct dm_thin_new_mapping *m) 
	} else

		cell_defer(tc, m->cell, m->data_block);



out:

	list_del(&m->list);

	mempool_free(m, tc->pool->mapping_pool);

}