bcache: Fix null pointer dereferencing

(cherry picked from commit a14f21bf1ddbb93b13a917cad8720fed6c94d6de)

Conflicts:
	lib/device/bcache.c

diff --git a/lib/device/bcache.c b/lib/device/bcache.c
index 3b780474d75f5a038242fcbc5a2b1a2514ee46d5..c7c19097c3815919a68228cb36ae9df1a0cd2d15 100644 (file)
--- a/lib/device/bcache.c
+++ b/lib/device/bcache.c
@@ -559,11 +559,13 @@ static bool _init_free_list(struct bcache *cache, unsigned count, unsigned pgsiz
        if (!data)
                return false;
 
-       cache->raw_data = data;
        cache->raw_blocks = dm_malloc(count * sizeof(*cache->raw_blocks));
-
        if (!cache->raw_blocks)
-               dm_free(cache->raw_data);
+               free(data);
+               return false;
+       }
+
+       cache->raw_data = data;
 
        for (i = 0; i < count; i++) {
                struct block *b = cache->raw_blocks + i;