• Jason Wang's avatar
    vhost-scsi: unbreak any layout for response · 6dd88fd5
    Jason Wang authored
    Al Viro said:
    
    """
    Since "vhost/scsi: fix reuse of &vq->iov[out] in response"
    we have this:
                    cmd->tvc_resp_iov = vq->iov[vc.out];
                    cmd->tvc_in_iovs = vc.in;
    combined with
                    iov_iter_init(&iov_iter, ITER_DEST, &cmd->tvc_resp_iov,
                                  cmd->tvc_in_iovs, sizeof(v_rsp));
    in vhost_scsi_complete_cmd_work().  We used to have ->tvc_resp_iov
    _pointing_ to vq->iov[vc.out]; back then iov_iter_init() asked to
    set an iovec-backed iov_iter over the tail of vq->iov[], with
    length being the amount of iovecs in the tail.
    
    Now we have a copy of one element of that array.  Fortunately, the members
    following it in the containing structure are two non-NULL kernel pointers,
    so copy_to_iter() will not copy anything beyond the first iovec - kernel
    pointer is not (on the majority of architectures) going to be accepted by
    access_ok() in copyout() and it won't be skipped since the "length" (in
    reality - another non-NULL kernel pointer) won't be zero.
    
    So it's not going to give a guest-to-qemu escalation, but it's definitely
    a bug.  Frankly, my preference would be to verify that the very first iovec
    is long enough to hold rsp_size.  Due to the above, any users that try to
    give us vq->iov[vc.out].iov_len < sizeof(struct virtio_scsi_cmd_resp)
    would currently get a failure in vhost_scsi_complete_cmd_work()
    anyway.
    """
    
    However, the spec doesn't say anything about the legacy descriptor
    layout for the respone. So this patch tries to not assume the response
    to reside in a single separate descriptor which is what commit
    79c14141 ("vhost/scsi: Convert completion path to use") tries to
    achieve towards to ANY_LAYOUT.
    
    This is done by allocating and using dedicate resp iov in the
    command. To be safety, start with UIO_MAXIOV to be consistent with the
    limitation that we advertise to the vhost_get_vq_desc().
    
    Testing with the hacked virtio-scsi driver that use 1 descriptor for 1
    byte in the response.
    Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    Cc: Benjamin Coddington <bcodding@redhat.com>
    Cc: Nicholas Bellinger <nab@linux-iscsi.org>
    Fixes: a77ec83a ("vhost/scsi: fix reuse of &vq->iov[out] in response")
    Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
    Message-Id: <20230119073647.76467-1-jasowang@redhat.com>
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
    6dd88fd5
scsi.c 65.3 KB