Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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: Benjamin Marzinski <bmarzins@redhat.com>
Acked-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org

authored by

Benjamin Marzinski and committed by
Mike Snitzer
314c25c5 58fc4fed

+7 -9
+7 -9
drivers/md/persistent-data/dm-space-map-metadata.c
··· 775 775 memcpy(&smm->sm, &bootstrap_ops, sizeof(smm->sm)); 776 776 777 777 r = sm_ll_new_metadata(&smm->ll, tm); 778 - if (r) 779 - return r; 780 - 781 - if (nr_blocks > DM_SM_METADATA_MAX_BLOCKS) 782 - nr_blocks = DM_SM_METADATA_MAX_BLOCKS; 783 - r = sm_ll_extend(&smm->ll, nr_blocks); 784 - if (r) 785 - return r; 786 - 778 + if (!r) { 779 + if (nr_blocks > DM_SM_METADATA_MAX_BLOCKS) 780 + nr_blocks = DM_SM_METADATA_MAX_BLOCKS; 781 + r = sm_ll_extend(&smm->ll, nr_blocks); 782 + } 787 783 memcpy(&smm->sm, &ops, sizeof(smm->sm)); 784 + if (r) 785 + return r; 788 786 789 787 /* 790 788 * Now we need to update the newly created data structures with the