[ 087/122] dm thin: fix memory leak in process_prepared_mapping error paths

From: Greg Kroah-Hartman
Date: Tue Aug 07 2012 - 19:27:26 EST


From: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>

3.5-stable review patch. If anyone has any objections, please let me know.

------------------

From: Joe Thornber <ejt@xxxxxxxxxx>

commit 905386f82d08f66726912f303f3e6605248c60a3 upstream.

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: Joe Thornber <ejt@xxxxxxxxxx>
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Alasdair G Kergon <agk@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/md/dm-thin.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -859,7 +859,7 @@ static void process_prepared_mapping(str

if (m->err) {
cell_error(m->cell);
- return;
+ goto out;
}

/*
@@ -871,7 +871,7 @@ static void process_prepared_mapping(str
if (r) {
DMERR("dm_thin_insert_block() failed");
cell_error(m->cell);
- return;
+ goto out;
}

/*
@@ -886,6 +886,7 @@ static void process_prepared_mapping(str
} else
cell_defer(tc, m->cell, m->data_block);

+out:
list_del(&m->list);
mempool_free(m, tc->pool->mapping_pool);
}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/