1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index c61960deb74a..ccb9975a97fa 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -471,7 +471,6 @@ static void nullb_device_release(struct config_item *item)
 {
         struct nullb_device *dev = to_nullb_device(item);
 
-        badblocks_exit(&dev->badblocks);
         null_free_device_storage(dev, false);
         null_free_dev(dev);
 }
@@ -582,6 +581,10 @@ static struct nullb_device *null_alloc_dev(void)
 
 static void null_free_dev(struct nullb_device *dev)
 {
+        if (!dev)
+                return;
+
+        badblocks_exit(&dev->badblocks);
         kfree(dev);
 }