Commit 28afea5b authored May 19, 2009 by Ian Campbell Committed by Jens Axboe May 19, 2009

xen/blkfront: allow xenbus state transition to Closing->Closed when not Connected



This situation can occur when attempting to attach a block device whose
backend is an empty physical CD-ROM driver. The backend in this case
will go directly from the Initialising state to Closing->Closed.
Previously this would result in a NULL pointer deref on info->gd
(xenbus_dev_fatal does not return as a1a15ac5 seems to expect)

Cc: stable@kernel.org
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

parent 22ef37ee

drivers/block/xen-blkfront.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -977,8 +977,10 @@ static void backend_changed(struct xenbus_device *dev,
	break;		break;

	case XenbusStateClosing:		case XenbusStateClosing:
	if (info->gd == NULL)		if (info->gd == NULL) {
	xenbus_dev_fatal(dev, -ENODEV, "gd is NULL");		xenbus_frontend_closed(dev);
			break;
			}
	bd = bdget_disk(info->gd, 0);		bd = bdget_disk(info->gd, 0);
	if (bd == NULL)		if (bd == NULL)
	xenbus_dev_fatal(dev, -ENODEV, "bdget failed");		xenbus_dev_fatal(dev, -ENODEV, "bdget failed");