diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2013-10-25 10:44:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 12:05:32 +0900 |
| commit | 722b78bc8a42b6910c291266e87abe2e63dc750f (patch) | |
| tree | febcc53f13d9ca16de1db0b08afccf620a18e0cd /drivers | |
| parent | f21abb623ac78e2e9248057282d0de4e9b82e616 (diff) | |
| download | linux-3.10-722b78bc8a42b6910c291266e87abe2e63dc750f.tar.gz linux-3.10-722b78bc8a42b6910c291266e87abe2e63dc750f.tar.bz2 linux-3.10-722b78bc8a42b6910c291266e87abe2e63dc750f.zip | |
vhost/scsi: Fix incorrect usage of get_user_pages_fast write parameter
commit 60a01f558af9c48b0bb31f303c479e32721add3f upstream.
This patch addresses a long-standing bug where the get_user_pages_fast()
write parameter used for setting the underlying page table entry permission
bits was incorrectly set to write=1 for data_direction=DMA_TO_DEVICE, and
passed into get_user_pages_fast() via vhost_scsi_map_iov_to_sgl().
However, this parameter is intended to signal WRITEs to pinned userspace
PTEs for the virtio-scsi DMA_FROM_DEVICE -> READ payload case, and *not*
for the virtio-scsi DMA_TO_DEVICE -> WRITE payload case.
This bug would manifest itself as random process segmentation faults on
KVM host after repeated vhost starts + stops and/or with lots of vhost
endpoints + LUNs.
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Asias He <asias@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 70142029722..962c7e3c3ba 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -1017,7 +1017,7 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs, if (data_direction != DMA_NONE) { ret = vhost_scsi_map_iov_to_sgl(tv_cmd, &vq->iov[data_first], data_num, - data_direction == DMA_TO_DEVICE); + data_direction == DMA_FROM_DEVICE); if (unlikely(ret)) { vq_err(vq, "Failed to map iov to sgl\n"); goto err_free; |