xen/blkfront: avoid NULL blkfront_info dereference on device removal

[mirror_ubuntu-bionic-kernel.git] / drivers / block / xen-blkfront.c

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 7d23225f79ed3e5975ade384cfde7bdae6097224..4b2dcb65b011f1e9d9247a6a03073ec631d4a733 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2471,6 +2471,9 @@ static int blkfront_remove(struct xenbus_device *xbdev)
 
        dev_dbg(&xbdev->dev, "%s removed", xbdev->nodename);
 
+       if (!info)
+               return 0;
+
        blkif_free(info, 0);
 
        mutex_lock(&info->mutex);