summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorCathy Avery <cathy.avery@oracle.com>2015-10-02 16:35:01 +0300
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2015-10-07 22:15:18 +0300
commita54c8f0f2d7df525ff997e2afe71866a1a013064 (patch)
tree6370e6c6462e6757cf2f5c3b09d6de719ff51d3b /drivers/block
parentf929d42ceb18a8acfd47e0e7b7d90b5d49bd9258 (diff)
downloadlinux-a54c8f0f2d7df525ff997e2afe71866a1a013064.tar.xz
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)
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. CC: stable@vger.kernel.org Signed-off-by: Cathy Avery <cathy.avery@oracle.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/xen-blkfront.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 6d89ed35d80c..c8fdbc77f9b1 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1968,7 +1968,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;
}
}