From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0138EA04C8 for ; Fri, 15 Nov 2019 05:41:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D0F2C2C28; Fri, 15 Nov 2019 05:41:53 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 4EBD691 for ; Fri, 15 Nov 2019 05:41:51 +0100 (CET) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2019 20:41:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,307,1569308400"; d="scan'208";a="235942471" Received: from dpdk-virtio-tbie-2.sh.intel.com (HELO ___) ([10.67.104.74]) by fmsmga002.fm.intel.com with ESMTP; 14 Nov 2019 20:41:49 -0800 Date: Fri, 15 Nov 2019 12:42:27 +0800 From: Tiwei Bie To: Maxime Coquelin Cc: stable@dpdk.org, Zhike Wang Message-ID: <20191115044227.GA27889@___> References: <20191114151629.27435-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191114151629.27435-1-maxime.coquelin@redhat.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-stable] [18.11 LTS PATCH] vhost: fix vring requests validation broken if no FD X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Thu, Nov 14, 2019 at 04:16:29PM +0100, Maxime Coquelin wrote: > From: Zhike Wang > > 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") > Cc: stable@dpdk.org > > Signed-off-by: Zhike Wang > Reviewed-by: Maxime Coquelin > --- Reviewed-by: Tiwei Bie Thanks! Tiwei > > Backport not tested yet. > > lib/librte_vhost/vhost_user.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c > index 98cd670e03..530823ecd9 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; > -- > 2.21.0 >