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 4E4E4A04C5 for ; Fri, 15 Nov 2019 11:36:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E2B5235; Fri, 15 Nov 2019 11:36:30 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 7A2FD235 for ; Fri, 15 Nov 2019 11:36:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573814188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YUOxDWwrx3edOxwF4KNOVfx9NEpZxMdYT0L7f2gIvGg=; b=a48GKdznRlmxbdPlCxZ9WkU9A8seHmAn2CDUoWOUgxFEAuS2JYlbGEy77QixzNvunfsnBp Z8twqVAb6uO6gP1DrDeEJjCjEUlDFT9+9p+skK5PS+x3WnLhSRvAbBjtvI+DoJOIEdaair vnnBcLS0ShA25TqzBfWzM4nPfdtkqnQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-1-QzhiuDxeNmmR1NqJlVFmvQ-1; Fri, 15 Nov 2019 05:36:25 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B15A7477; Fri, 15 Nov 2019 10:36:24 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.112.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 829EF8918; Fri, 15 Nov 2019 10:36:20 +0000 (UTC) From: Maxime Coquelin To: stable@dpdk.org, tiwei.bie@intel.com Cc: Zhike Wang , Maxime Coquelin Date: Fri, 15 Nov 2019 11:36:15 +0100 Message-Id: <20191115103615.17858-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: QzhiuDxeNmmR1NqJlVFmvQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] [16.11 LTS PATCH v2] 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" 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: 1bf11cfb7c7c ("vhost: fix possible denial of service by leaking FDs"= ) Cc: stable@dpdk.org Signed-off-by: Zhike Wang Reviewed-by: Maxime Coquelin --- 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 a6ab131543..1b3e3b178d 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1078,6 +1078,7 @@ vhost_user_msg_handler(int vid, int fd) =09struct VhostUserMsg msg; =09int ret; =09int unlock_required =3D 0; +=09int expected_fds; =20 =09dev =3D get_device(vid); =09if (dev =3D=3D NULL) @@ -1236,20 +1237,26 @@ vhost_user_msg_handler(int vid, int fd) =09=09break; =20 =09case VHOST_USER_SET_VRING_KICK: -=09=09if (validate_msg_fds(&msg, 1) !=3D 0) +=09=09expected_fds =3D +=09=09=09(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1; +=09=09if (validate_msg_fds(&msg, expected_fds) !=3D 0) =09=09=09return -1; =20 =09=09ret =3D vhost_user_set_vring_kick(dev, &msg); =09=09break; =09case VHOST_USER_SET_VRING_CALL: -=09=09if (validate_msg_fds(&msg, 1) !=3D 0) +=09=09expected_fds =3D +=09=09=09(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1; +=09=09if (validate_msg_fds(&msg, expected_fds) !=3D 0) =09=09=09return -1; =20 =09=09vhost_user_set_vring_call(dev, &msg); =09=09break; =20 =09case VHOST_USER_SET_VRING_ERR: -=09=09if (validate_msg_fds(&msg, 1) !=3D 0) +=09=09expected_fds =3D +=09=09=09(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1; +=09=09if (validate_msg_fds(&msg, expected_fds) !=3D 0) =09=09=09return -1; =20 =09=09if (!(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK)) --=20 2.21.0