From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIKzh-0007qz-Tv for qemu-devel@nongnu.org; Fri, 15 Aug 2014 13:08:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIKzb-0000WX-K9 for qemu-devel@nongnu.org; Fri, 15 Aug 2014 13:08:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIKzb-0000WJ-Ad for qemu-devel@nongnu.org; Fri, 15 Aug 2014 13:08:43 -0400 From: Stefan Hajnoczi Date: Fri, 15 Aug 2014 18:06:51 +0100 Message-Id: <1408122422-13935-45-git-send-email-stefanha@redhat.com> In-Reply-To: <1408122422-13935-1-git-send-email-stefanha@redhat.com> References: <1408122422-13935-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 44/55] virtio-blk: Correct bug in support for flexible descriptor layout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Peter Maydell , Stefan Hajnoczi From: Marc Mar=C3=AD Without this correction, only a three descriptor layout is accepted, and requests with just two descriptors are not completed and no error message= is displayed. Signed-off-by: Stefan Hajnoczi Signed-off-by: Marc Mar=C3=AD Signed-off-by: Stefan Hajnoczi --- hw/block/virtio-blk.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index c241c50..302c39e 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -404,19 +404,19 @@ void virtio_blk_handle_request(VirtIOBlockReq *req,= MultiReqBuffer *mrb) * NB: per existing s/n string convention the string is * terminated by '\0' only when shorter than buffer. */ - strncpy(req->elem.in_sg[0].iov_base, - s->blk.serial ? s->blk.serial : "", - MIN(req->elem.in_sg[0].iov_len, VIRTIO_BLK_ID_BYTES)); + const char *serial =3D s->blk.serial ? s->blk.serial : ""; + size_t size =3D MIN(strlen(serial) + 1, + MIN(iov_size(in_iov, in_num), + VIRTIO_BLK_ID_BYTES)); + iov_from_buf(in_iov, in_num, 0, serial, size); virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); virtio_blk_free_request(req); } else if (type & VIRTIO_BLK_T_OUT) { - qemu_iovec_init_external(&req->qiov, &req->elem.out_sg[1], - req->elem.out_num - 1); + qemu_iovec_init_external(&req->qiov, iov, out_num); virtio_blk_handle_write(req, mrb); } else if (type =3D=3D VIRTIO_BLK_T_IN || type =3D=3D VIRTIO_BLK_T_B= ARRIER) { /* VIRTIO_BLK_T_IN is 0, so we can't just & it. */ - qemu_iovec_init_external(&req->qiov, &req->elem.in_sg[0], - req->elem.in_num - 1); + qemu_iovec_init_external(&req->qiov, in_iov, in_num); virtio_blk_handle_read(req); } else { virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP); --=20 1.9.3