summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhike Wang <wangzk320@163.com>2019-11-14 16:16:29 +0100
committerKevin Traynor <ktraynor@redhat.com>2019-11-15 15:42:41 +0000
commitafc8c11865ef4770b4b19bb6610fa497767530a0 (patch)
tree59270450f28b47228f6fcedf06be6dbfc6cba0a9
parente6f0c6c7debe7693e3b80d721842841d56be42e7 (diff)
downloaddpdk-stable-afc8c11865ef4770b4b19bb6610fa497767530a0.zip
dpdk-stable-afc8c11865ef4770b4b19bb6610fa497767530a0.tar.gz
dpdk-stable-afc8c11865ef4770b4b19bb6610fa497767530a0.tar.xz
vhost: fix vring requests validation broken if no FD
[ upstream commit 1407b0752eee2353160701d0182c7e911ccb538a] When VHOST_USER_VRING_NOFD_MASK is set, the fd_num is 0, so validate_msg_fds() will return error. In this case, the negotiation of vring message between vhost user front end and back end would fail, and as a result, vhost user link could NOT be up. How to reproduce: 1.Run dpdk testpmd insides VM, which locates at host with ovs+dpdk. 2.Notice that inside ovs there are endless logs regarding failure to handle VHOST_USER_SET_VRING_CALL, and link of vm could NOT be up. Fixes: f8898927bb16 ("vhost: fix possible denial of service by leaking FDs") Signed-off-by: Zhike Wang <wangzk320@163.com> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com> Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
-rw-r--r--lib/librte_vhost/vhost_user.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 98cd670..530823e 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1241,8 +1241,10 @@ vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg,
struct virtio_net *dev = *pdev;
struct vhost_vring_file file;
struct vhost_virtqueue *vq;
+ int expected_fds;
- if (validate_msg_fds(msg, 1) != 0)
+ expected_fds = (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
+ if (validate_msg_fds(msg, expected_fds) != 0)
return VH_RESULT_ERR;
file.index = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
@@ -1266,7 +1268,10 @@ static int vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused,
struct VhostUserMsg *msg,
int main_fd __rte_unused)
{
- if (validate_msg_fds(msg, 1) != 0)
+ int expected_fds;
+
+ expected_fds = (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
+ if (validate_msg_fds(msg, expected_fds) != 0)
return VH_RESULT_ERR;
if (!(msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK))
@@ -1283,8 +1288,10 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
struct virtio_net *dev = *pdev;
struct vhost_vring_file file;
struct vhost_virtqueue *vq;
+ int expected_fds;
- if (validate_msg_fds(msg, 1) != 0)
+ expected_fds = (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
+ if (validate_msg_fds(msg, expected_fds) != 0)
return VH_RESULT_ERR;
file.index = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK;