patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Tiwei Bie <tiwei.bie@intel.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: stable@dpdk.org, Zhike Wang <wangzk320@163.com>
Subject: Re: [dpdk-stable] [16.11 LTS PATCH] vhost: fix vring requests validation broken if no FD
Date: Fri, 15 Nov 2019 12:32:21 +0800	[thread overview]
Message-ID: <20191115043221.GB24818@___> (raw)
In-Reply-To: <20191114151601.27308-1-maxime.coquelin@redhat.com>

On Thu, Nov 14, 2019 at 04:16:01PM +0100, Maxime Coquelin wrote:
> From: Zhike Wang <wangzk320@163.com>
> 
> 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 <wangzk320@163.com>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> 
> Backport not tested yet.
> 
>  lib/librte_vhost/vhost_user.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index a6ab131543..5aeb0c1691 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)
>  	struct VhostUserMsg msg;
>  	int ret;
>  	int unlock_required = 0;
> +	int expected_fds;
>  
>  	dev = get_device(vid);
>  	if (dev == NULL)
> @@ -1236,12 +1237,16 @@ vhost_user_msg_handler(int vid, int fd)
>  		break;
>  
>  	case VHOST_USER_SET_VRING_KICK:
> -		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 -1;
>  
>  		ret = vhost_user_set_vring_kick(dev, &msg);
>  		break;
>  	case VHOST_USER_SET_VRING_CALL:
> +		expected_fds =
> +			(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
>  		if (validate_msg_fds(&msg, 1) != 0)

Typo, s/1/expected_fds/

>  			return -1;
>  
> @@ -1249,6 +1254,8 @@ vhost_user_msg_handler(int vid, int fd)
>  		break;
>  
>  	case VHOST_USER_SET_VRING_ERR:
> +		expected_fds =
> +			(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
>  		if (validate_msg_fds(&msg, 1) != 0)

Ditto.

Thanks,
Tiwei

>  			return -1;
>  
> -- 
> 2.21.0
> 

      reply	other threads:[~2019-11-15  4:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-14 15:16 Maxime Coquelin
2019-11-15  4:32 ` Tiwei Bie [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191115043221.GB24818@___ \
    --to=tiwei.bie@intel.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=stable@dpdk.org \
    --cc=wangzk320@163.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).