vdpa: Remove shadow CVQ command check
PATCH 1/1 vdpa: Remove shadow CVQ command check
The guest will see undefined behavior if it issue not negotiate commands, bit it is expected somehow.
Simplify code deleting this check.
Signed-off-by Eugenio Pérez <[email protected]>
Acked-by Jason Wang <[email protected]>
--- net/vhost-vdpa.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-)
net/vhost-vdpa.c +0 -48
@@ -461,48 +461,6 @@ static NetClientInfo net_vhost_vdpa_cvq_info = { .check_peer_type = vhost_vdpa_check_peer_type, }; -/** -* Do not forward commands not supported by SVQ. Otherwise, the device could -* accept it and qemu would not know how to update the device model. -*/ -static bool vhost_vdpa_net_cvq_validate_cmd (const void *out_buf,size_t len) -{ -struct virtio_net_ctrl_hdr ctrl; - -if (unlikely (len <sizeof (ctrl))) { -qemu_log_mask (LOG_GUEST_ERROR , -"%s: invalid legnth of out buffer %zu\n" , __func__, len); -return false; - } - -memcpy (&ctrl, out_buf,sizeof (ctrl)); -switch (ctrl.class) { -case VIRTIO_NET_CTRL_MAC : -switch (ctrl.cmd) { -case VIRTIO_NET_CTRL_MAC_ADDR_SET : -return true; -default : -qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid mac cmd %u\n" , - __func__, ctrl.cmd); - }; -break ; -case VIRTIO_NET_CTRL_MQ : -switch (ctrl.cmd) { -case VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET : -return true; -default : -qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid mq cmd %u\n" , - __func__, ctrl.cmd); - }; -break ; -default : -qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid control class %u\n" , - __func__, ctrl.class); - }; - -return false; -} -/** * Validate and copy control virtqueue commands. *
@@ -526,16 +484,10 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq, .iov_len = sizeof(status), };ssize_t dev_written = -EINVAL ; -bool ok; out.iov_len =iov_to_buf (elem->out_sg, elem->out_num,0 , s->cvq_cmd_out_buffer,vhost_vdpa_net_cvq_cmd_len ()); - ok =vhost_vdpa_net_cvq_validate_cmd (s->cvq_cmd_out_buffer, out.iov_len); -if (unlikely (!ok)) { - goto out; - } - dev_written =vhost_vdpa_net_cvq_add (s, out.iov_len,sizeof (status));if (unlikely (dev_written <0 )) { goto out;
Signature · 1 line
2.31.1
Jason Wang
AppliedQuoted 8 lines · Eugenio Pérez
The guest will see undefined behavior if it issue not negotiate commands, bit it is expected somehow.
Simplify code deleting this check.
Signed-off-by Eugenio Pérez <[email protected]>Acked-by Jason Wang <[email protected]>
Applied.
Thanks
Quoted 77 lines
--- net/vhost-vdpa.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-)net/vhost-vdpa.c +0
-49@@ -461,48 +461,6 @@ static NetClientInfo net_vhost_vdpa_cvq_info = { .check_peer_type = vhost_vdpa_check_peer_type, }; -/** -* Do not forward commands not supported by SVQ. Otherwise, the device could -* accept it and qemu would not know how to update the device model. -*/ -static bool vhost_vdpa_net_cvq_validate_cmd (const void *out_buf,size_t len) -{ -struct virtio_net_ctrl_hdr ctrl; - -if (unlikely (len <sizeof (ctrl))) { -qemu_log_mask (LOG_GUEST_ERROR , -"%s: invalid legnth of out buffer %zu\n" , __func__, len); -return false; - } - -memcpy (&ctrl, out_buf,sizeof (ctrl)); -switch (ctrl.class) { -case VIRTIO_NET_CTRL_MAC : -switch (ctrl.cmd) { -case VIRTIO_NET_CTRL_MAC_ADDR_SET : -return true; -default : -qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid mac cmd %u\n" , - __func__, ctrl.cmd); - }; -break ; -case VIRTIO_NET_CTRL_MQ : -switch (ctrl.cmd) { -case VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET : -return true; -default : -qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid mq cmd %u\n" , - __func__, ctrl.cmd); - }; -break ; -default : -qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid control class %u\n" , - __func__, ctrl.class); - }; - -return false; -} -/** * Validate and copy control virtqueue commands. * @@ -526,16 +484,10 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq, .iov_len = sizeof(status), };ssize_t dev_written = -EINVAL ; -bool ok; out.iov_len =iov_to_buf (elem->out_sg, elem->out_num,0 , s->cvq_cmd_out_buffer,vhost_vdpa_net_cvq_cmd_len ()); - ok =vhost_vdpa_net_cvq_validate_cmd (s->cvq_cmd_out_buffer, out.iov_len); -if (unlikely (!ok)) { - goto out; - } - dev_written =vhost_vdpa_net_cvq_add (s, out.iov_len,sizeof (status));if (unlikely (dev_written <0 )) { goto out; --2.31.1