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: dev@dpdk.org, zhihong.wang@intel.com, stable@dpdk.org,
	Ilja Van Sprundel <ivansprundel@ioactive.com>
Subject: Re: [dpdk-stable] [PATCH] vhost: check vhost message header size read
Date: Fri, 17 Jan 2020 15:54:34 +0800
Message-ID: <20200117075433.GA218008@___> (raw)
In-Reply-To: <20200116104444.3862-1-maxime.coquelin@redhat.com>

On Thu, Jan 16, 2020 at 11:44:44AM +0100, Maxime Coquelin wrote:
> This patch adds a check to ensure the read size of
> the Vhost-user message header is not smaller than
> the expected size.
> 
> Fixes: 8f972312b8f4 ("vhost: support vhost-user")
> Cc: stable@dpdk.org
> 
> Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
>  lib/librte_vhost/vhost_user.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 69b84a8820..0b7d1e288e 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -2440,8 +2440,12 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
>  
>  	ret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE,
>  		msg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num);
> -	if (ret <= 0)
> +	if (ret <= 0) {
>  		return ret;
> +	} else if (ret != VHOST_USER_HDR_SIZE) {
> +		VHOST_LOG_CONFIG(ERR, "Unexpected header size read\n");
> +		return -1;

It's better to close the potential fds in msg->fds[]
e.g. by calling close_msg_fds(msg).

Regards,
Tiwei

> +	}
>  
>  	if (msg->size) {
>  		if (msg->size > sizeof(msg->payload)) {
> -- 
> 2.21.0
> 

  reply	other threads:[~2020-01-17  7:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-16 10:44 Maxime Coquelin
2020-01-17  7:54 ` Tiwei Bie [this message]
2020-02-05 14:12   ` Maxime Coquelin

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=20200117075433.GA218008@___ \
    --to=tiwei.bie@intel.com \
    --cc=dev@dpdk.org \
    --cc=ivansprundel@ioactive.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=stable@dpdk.org \
    --cc=zhihong.wang@intel.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

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git