patches for DPDK stable branches
 help / color / Atom feed
* [dpdk-stable] [PATCH v2] vhost: check vhost message header size read
@ 2020-02-05 15:05 Maxime Coquelin
  2020-02-06  3:03 ` Tiwei Bie
  2020-02-13 16:30 ` Maxime Coquelin
  0 siblings, 2 replies; 3+ messages in thread
From: Maxime Coquelin @ 2020-02-05 15:05 UTC (permalink / raw)
  To: dev, tiwei.bie, zhihong.wang; +Cc: stable, Maxime Coquelin, Ilja Van Sprundel

This patch adds a check to ensure the read size of
the Vhost-user message header is not smaller than
the expected size.

In case of unexpected read size, report an error
and close file descriptors passed with the message,
if any.

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>
---

v2: close message FDs on error (Tiwei)

 lib/librte_vhost/vhost_user.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 9f14ea6676..91482ccd67 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2456,8 +2456,13 @@ 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");
+		close_msg_fds(msg);
+		return -1;
+	}
 
 	if (msg->size) {
 		if (msg->size > sizeof(msg->payload)) {
-- 
2.24.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH v2] vhost: check vhost message header size read
  2020-02-05 15:05 [dpdk-stable] [PATCH v2] vhost: check vhost message header size read Maxime Coquelin
@ 2020-02-06  3:03 ` Tiwei Bie
  2020-02-13 16:30 ` Maxime Coquelin
  1 sibling, 0 replies; 3+ messages in thread
From: Tiwei Bie @ 2020-02-06  3:03 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: dev, zhihong.wang, stable, Ilja Van Sprundel

On Wed, Feb 05, 2020 at 04:05:29PM +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.
> 
> In case of unexpected read size, report an error
> and close file descriptors passed with the message,
> if any.
> 
> 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>
> ---
> 
> v2: close message FDs on error (Tiwei)
> 
>  lib/librte_vhost/vhost_user.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>

Thanks!
Tiwei

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH v2] vhost: check vhost message header size read
  2020-02-05 15:05 [dpdk-stable] [PATCH v2] vhost: check vhost message header size read Maxime Coquelin
  2020-02-06  3:03 ` Tiwei Bie
@ 2020-02-13 16:30 ` Maxime Coquelin
  1 sibling, 0 replies; 3+ messages in thread
From: Maxime Coquelin @ 2020-02-13 16:30 UTC (permalink / raw)
  To: dev, tiwei.bie, zhihong.wang; +Cc: stable, Ilja Van Sprundel



On 2/5/20 4:05 PM, 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.
> 
> In case of unexpected read size, report an error
> and close file descriptors passed with the message,
> if any.
> 
> 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>
> ---
> 
> v2: close message FDs on error (Tiwei)
> 
>  lib/librte_vhost/vhost_user.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
Applied to dpdk-next-virtio/master

Thanks,
Maxime


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-05 15:05 [dpdk-stable] [PATCH v2] vhost: check vhost message header size read Maxime Coquelin
2020-02-06  3:03 ` Tiwei Bie
2020-02-13 16:30 ` Maxime Coquelin

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://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/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


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