diff options
author | Cathy Avery <cathy.avery@oracle.com> | 2015-10-02 09:35:01 -0400 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2015-11-17 15:54:43 +0000 |
commit | 26e6ab3e52ef3f4399bb7e94eb71c553cace88fe (patch) | |
tree | e58ab0d4cddbd3e106fa00cf0e483867d0edce72 | |
parent | 677ee63365fecb0d15df00fc6bd282b0ced7eaef (diff) |
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)
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: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | drivers/block/xen-blkfront.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 96b8cb7573a4..857f3632dce7 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1292,7 +1292,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; } } |