]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)
authorCathy Avery <cathy.avery@oracle.com>
Fri, 2 Oct 2015 13:35:01 +0000 (09:35 -0400)
committerZefan Li <lizefan@huawei.com>
Wed, 27 Apr 2016 10:55:27 +0000 (18:55 +0800)
commit a54c8f0f2d7df525ff997e2afe71866a1a013064 upstream.

xen-blkfront will crash if the check to talk_to_blkback()
in blkback_changed()(XenbusStateInitWait) returns an error.
The driver data is freed and info is set to NULL. Later during
the close process via talk_to_blkback's call to xenbus_dev_fatal()
the null pointer is passed to and dereference in blkfront_closing.

Signed-off-by: Cathy Avery <cathy.avery@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Zefan Li <lizefan@huawei.com>
drivers/block/xen-blkfront.c

index a81cdd7b9d83289b0372bb289c1a699ba8f82d43..16477b255d8283ad8c71275005e4ab3e7da88ce5 100644 (file)
@@ -1314,7 +1314,8 @@ static void blkback_changed(struct xenbus_device *dev,
                        break;
                /* Missed the backend's Closing state -- fallthrough */
        case XenbusStateClosing:
-               blkfront_closing(info);
+               if (info)
+                       blkfront_closing(info);
                break;
        }
 }