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

Commit c235082b authored by Cornelia Huck's avatar Cornelia Huck Committed by Michael S. Tsirkin
Browse files

virtio/s390: size of SET_IND payload 



SET_IND takes as a payload the _address_ of the indicators, meaning
that we have one of the rare cases where kmalloc(sizeof(&...)) is
actually correct. Let's clarify that with a comment.

The count for the ccw, however, was only correct because the
indicators are 64 bit. Let's use the correct value.

Reported-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 15e90f52

drivers/s390/virtio/virtio_ccw.c

+8 −4
Original line number Diff line number Diff line
@@ -342,13 +342,14 @@ static void virtio_ccw_drop_indicator(struct virtio_ccw_device *vcdev, 
		ccw->count = sizeof(*thinint_area);

		ccw->cda = (__u32)(unsigned long) thinint_area;

	} else {

		/* payload is the address of the indicators */

		indicatorp = kmalloc(sizeof(&vcdev->indicators),

				     GFP_DMA | GFP_KERNEL);

		if (!indicatorp)

			return;

		*indicatorp = 0;

		ccw->cmd_code = CCW_CMD_SET_IND;

		ccw->count = sizeof(vcdev->indicators);

		ccw->count = sizeof(&vcdev->indicators);

		ccw->cda = (__u32)(unsigned long) indicatorp;

	}

	/* Deregister indicators from host. */
@@ -656,7 +657,10 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
		}

	}

	ret = -ENOMEM;

	/* We need a data area under 2G to communicate. */

	/*

	 * We need a data area under 2G to communicate. Our payload is

	 * the address of the indicators.

	*/

	indicatorp = kmalloc(sizeof(&vcdev->indicators), GFP_DMA | GFP_KERNEL);

	if (!indicatorp)

		goto out;
@@ -672,7 +676,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
		vcdev->indicators = 0;

		ccw->cmd_code = CCW_CMD_SET_IND;

		ccw->flags = 0;

		ccw->count = sizeof(vcdev->indicators);

		ccw->count = sizeof(&vcdev->indicators);

		ccw->cda = (__u32)(unsigned long) indicatorp;

		ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_IND);

		if (ret)
@@ -683,7 +687,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
	vcdev->indicators2 = 0;

	ccw->cmd_code = CCW_CMD_SET_CONF_IND;

	ccw->flags = 0;

	ccw->count = sizeof(vcdev->indicators2);

	ccw->count = sizeof(&vcdev->indicators2);

	ccw->cda = (__u32)(unsigned long) indicatorp;

	ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_CONF_IND);

	if (ret)