Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6464920a authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Konrad Rzeszutek Wilk
Browse files

xen/blkback: don't call vbd_size() if bd_disk is NULL 



...because vbd_size() dereferences bd_disk if bd_part is NULL.

Signed-off-by: default avatarLaszlo <Ersek&lt;lersek@redhat.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 4c49ff3f

drivers/block/xen-blkback/xenbus.c

+1 −2
Original line number Diff line number Diff line
@@ -357,14 +357,13 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, 
	}



	vbd->bdev = bdev;

	vbd->size = vbd_sz(vbd);



	if (vbd->bdev->bd_disk == NULL) {

		DPRINTK("xen_vbd_create: device %08x doesn't exist.\n",

			vbd->pdevice);

		xen_vbd_free(vbd);

		return -ENOENT;

	}

	vbd->size = vbd_sz(vbd);



	if (vbd->bdev->bd_disk->flags & GENHD_FL_CD || cdrom)

		vbd->type |= VDISK_CDROM;