summaryrefslogtreecommitdiff
path: root/drivers
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:16:24 +0200
commit6c8faa19e9cc5fc0010737a2de38ad6b477bea30 (patch)
tree2aada83f7f1fa0fa9e2b554debb5a8af0cd0afd4 /drivers
parent8d2f62cb2d463456a4dbc84c59d1d2a05947fe20 (diff)
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>
Diffstat (limited to 'drivers')
-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 e2ea57d5376e..b5f541112fca 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -3571,14 +3571,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;
}