diff options
| author |   Xie Yongji <xieyongji@bytedance.com> | 2021-06-15 18:52:18 +0800 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2021-06-29 16:54:08 -0400 |
| commit | 5f638e5ac61ef1b9b588efdf688acc0a4cecdca2 (patch) | |
| tree | e89262446c4cce9b59d024a335f8ba130a0553a2 /drivers/scsi | |
| parent | scsi: ipr: System crashes when seeing type 20 error (diff) | |
| download | linux-dev-5f638e5ac61ef1b9b588efdf688acc0a4cecdca2.tar.xz linux-dev-5f638e5ac61ef1b9b588efdf688acc0a4cecdca2.zip | |
scsi: virtio_scsi: Add validation for residual bytes from response
This ensures that the residual bytes in response (might come from an
untrusted device) will not exceed the data buffer length.
Link: https://lore.kernel.org/r/20210615105218.214-1-xieyongji@bytedance.com
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/virtio_scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index ad78bf631900..b0deaf4af5a3 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -97,7 +97,7 @@ static inline struct Scsi_Host *virtio_scsi_host(struct virtio_device *vdev) static void virtscsi_compute_resid(struct scsi_cmnd *sc, u32 resid) { if (resid) - scsi_set_resid(sc, resid); + scsi_set_resid(sc, min(resid, scsi_bufflen(sc))); } /* |