summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShenghui Wang <shhuiw@foxmail.com>2018-10-07 14:45:41 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-18 09:18:18 +0200
commite725141c0f4ea390bc835102707ea2ca35718716 (patch)
tree08b7e4aea08e51e07a74d1ce5437079ce2122737
parentd8e15b143e4d34e60e4cb91b4ed49453e236e6d8 (diff)
downloadlinux-stable-e725141c0f4ea390bc835102707ea2ca35718716.tar.gz
linux-stable-e725141c0f4ea390bc835102707ea2ca35718716.tar.bz2
linux-stable-e725141c0f4ea390bc835102707ea2ca35718716.zip
dm cache: destroy migration_cache if cache target registration failed
commit c7cd55504a5b0fc826a2cd9540845979d24ae542 upstream. Commit 7e6358d244e47 ("dm: fix various targets to dm_register_target after module __init resources created") inadvertently introduced this bug when it moved dm_register_target() after the call to KMEM_CACHE(). Fixes: 7e6358d244e47 ("dm: fix various targets to dm_register_target after module __init resources created") Cc: stable@vger.kernel.org Signed-off-by: Shenghui Wang <shhuiw@foxmail.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/md/dm-cache-target.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index a39ae8f45e32..32379e0ac536 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -3492,14 +3492,13 @@ static int __init dm_cache_init(void)
int r;
migration_cache = KMEM_CACHE(dm_cache_migration, 0);
- if (!migration_cache) {
- dm_unregister_target(&cache_target);
+ if (!migration_cache)
return -ENOMEM;
- }
r = dm_register_target(&cache_target);
if (r) {
DMERR("cache target registration failed: %d", r);
+ kmem_cache_destroy(migration_cache);
return r;
}