Commit 701ec6e5 authored by Benjamin Marzinski's avatar Benjamin Marzinski Committed by Greg Kroah-Hartman

dm space map metadata: fix 'struct sm_metadata' leak on failed create

commit 314c25c5 upstream.

In dm_sm_metadata_create() we temporarily change the dm_space_map
operations from 'ops' (whose .destroy function deallocates the
sm_metadata) to 'bootstrap_ops' (whose .destroy function doesn't).

If dm_sm_metadata_create() fails in sm_ll_new_metadata() or
sm_ll_extend(), it exits back to dm_tm_create_internal(), which calls
dm_sm_destroy() with the intention of freeing the sm_metadata, but it
doesn't (because the dm_space_map operations is still set to
'bootstrap_ops').

Fix this by setting the dm_space_map operations back to 'ops' if
dm_sm_metadata_create() fails when it is set to 'bootstrap_ops'.
Signed-off-by: default avatarBenjamin Marzinski <bmarzins@redhat.com>
Acked-by: default avatarJoe Thornber <ejt@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85290a16
...@@ -775,17 +775,15 @@ int dm_sm_metadata_create(struct dm_space_map *sm, ...@@ -775,17 +775,15 @@ int dm_sm_metadata_create(struct dm_space_map *sm,
memcpy(&smm->sm, &bootstrap_ops, sizeof(smm->sm)); memcpy(&smm->sm, &bootstrap_ops, sizeof(smm->sm));
r = sm_ll_new_metadata(&smm->ll, tm); r = sm_ll_new_metadata(&smm->ll, tm);
if (r) if (!r) {
return r;
if (nr_blocks > DM_SM_METADATA_MAX_BLOCKS) if (nr_blocks > DM_SM_METADATA_MAX_BLOCKS)
nr_blocks = DM_SM_METADATA_MAX_BLOCKS; nr_blocks = DM_SM_METADATA_MAX_BLOCKS;
r = sm_ll_extend(&smm->ll, nr_blocks); r = sm_ll_extend(&smm->ll, nr_blocks);
}
memcpy(&smm->sm, &ops, sizeof(smm->sm));
if (r) if (r)
return r; return r;
memcpy(&smm->sm, &ops, sizeof(smm->sm));
/* /*
* Now we need to update the newly created data structures with the * Now we need to update the newly created data structures with the
* allocated blocks that they were built from. * allocated blocks that they were built from.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment