]> git.hungrycats.org Git - linux/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)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 15 Nov 2015 17:51:51 +0000 (12:51 -0500)
[ Upstream commit a54c8f0f2d7df525ff997e2afe71866a1a013064 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/block/xen-blkfront.c

index 218c4858f494655d5be8bf61f857b79080cdf9af..34a01f191b33ee364abdf397a10724aea48eb274 100644 (file)
@@ -1911,7 +1911,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;
        }
 }