vhost: fix possible out of bound access for indirect descs
PATCH 1/1 vhost: fix possible out of bound access for indirect descs
Fix a possible out of bound access which may happen when handling indirect descs in split ring.
Fixes 1be4ebb1c464 ("vhost: support indirect descriptor in mergeable Rx")
Reported-by Haiyue Wang <[email protected]>
Signed-off-by Tiwei Bie <[email protected]>
--- lib/librte_vhost/virtio_net.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
lib/librte_vhost/virtio_net.c +2 -6
@@ -310,6 +310,7 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,uint32_t len =0 ;uint64_t dlen;uint32_t nr_descs = vq->size; +uint32_t cnt =0 ;struct vring_desc *descs = vq->desc;struct vring_desc *idesc =NULL ;
@@ -348,12 +349,7 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq, }while (1 ) { -if (unlikely (idx >= vq->size)) { -free_ind_table (idesc); -return -1 ; - } - -if (unlikely (nr_descs-- ==0 )) { +if (unlikely (idx >= nr_descs || cnt++ >= nr_descs)) {free_ind_table (idesc);return -1 ; }
Signature · 1 line
2.17.1
Quoted 11 lines · Tiwei Bie
Fix a possible out of bound access which may happen when handling indirect descs in split ring.
Fixes 1be4ebb1c464 ("vhost: support indirect descriptor in mergeable Rx")Reported-by Haiyue Wang <[email protected]>Signed-off-by Tiwei Bie <[email protected]>--- lib/librte_vhost/virtio_net.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
Reviewed-by Maxime Coquelin <[email protected]>
Thanks,
Maxime
Quoted 12 lines · Tiwei Bie
Fix a possible out of bound access which may happen when handling indirect descs in split ring.
Fixes 1be4ebb1c464 ("vhost: support indirect descriptor in mergeable Rx")Reported-by Haiyue Wang <[email protected]>Signed-off-by Tiwei Bie <[email protected]>--- lib/librte_vhost/virtio_net.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
Applide to dpdk-next-virtio/master.
Thanks,
Maxime