]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bcache: fix cache_set_flush() NULL pointer dereference on OOM
authorEric Wheeler <git@linux.ewheeler.net>
Mon, 7 Mar 2016 23:17:50 +0000 (15:17 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:46:21 +0000 (15:46 -0700)
Orabug: 23331099

[ Upstream commit f8b11260a445169989d01df75d35af0f56178f95 ]

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>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit d09a05998d79dcfaa25de84624dce9f806fe4e7c)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
drivers/md/bcache/super.c

index 2d0650defd3748c36fce4803d68f75acd49451b7..2a102834c2ee03e789b29c50dc8d768119578966 100644 (file)
@@ -1404,6 +1404,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);