summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wheeler <git@linux.ewheeler.net>2016-03-07 15:17:50 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-12 09:12:46 -0700
commit183027f89d4bb94dbea83b28a5352e7812fa7ec8 (patch)
tree4722425f15a70a2f731781b6098fab658cab52eb
parentb45120a1ecb3b06e15dbeff61ec0da664282add8 (diff)
bcache: fix cache_set_flush() NULL pointer dereference on OOM
commit f8b11260a445169989d01df75d35af0f56178f95 upstream. When bch_cache_set_alloc() fails to kzalloc the cache_set, the asyncronous closure handling tries to dereference a cache_set that hadn't yet been allocated inside of cache_set_flush() which is called by __cache_set_unregister() during cleanup. This appears to happen only during an OOM condition on bcache_register. Signed-off-by: Eric Wheeler <bcache@linux.ewheeler.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/md/bcache/super.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 1b6beb1e3142..51ec648738f4 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1388,6 +1388,9 @@ static void cache_set_flush(struct closure *cl)
struct btree *b;
unsigned i;
+ if (!c)
+ closure_return(cl);
+
bch_cache_accounting_destroy(&c->accounting);
kobject_put(&c->internal);