| Message ID | 20210517095513.850-6-xieyongji@bytedance.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Introduce VDUSE - vDPA Device in Userspace | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
在 2021/5/17 下午5:55, Xie Yongji 写道: > This ensures that the residual bytes in response (might come > from an untrusted device) will not exceed the data buffer length. > > Signed-off-by: Xie Yongji <xieyongji@bytedance.com> > --- > drivers/scsi/virtio_scsi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c > index efcaf0674c8d..ad7d8cecec32 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))); > } > > /* Acked-by: Jason Wang <jasowang@redhat.com>
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index efcaf0674c8d..ad7d8cecec32 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))); } /*
This ensures that the residual bytes in response (might come from an untrusted device) will not exceed the data buffer length. Signed-off-by: Xie Yongji <xieyongji@bytedance.com> --- drivers/scsi/virtio_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)