[dpdk-stable] patch 'vhost: check message header size read' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 86ad179c5b1de7c352d65d6bd4e14294a26ba10b Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Wed, 5 Feb 2020 16:05:29 +0100
Subject: [PATCH] vhost: check message header size read

[ upstream commit 966f89d998a20eddb45666f06dd42a3c3fc94574 ]

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

Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 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 4312e5e536..d224932dda 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) {
+		RTE_LOG(ERR, VHOST_CONFIG, "Unexpected header size read\n");
+		close_msg_fds(msg);
+		return -1;
+	}
 
 	if (msg->size) {
 		if (msg->size > sizeof(msg->payload)) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.348690930 +0000
+++ 0037-vhost-check-message-header-size-read.patch	2020-02-17 17:00:15.355951135 +0000
@@ -1,8 +1,10 @@
-From 966f89d998a20eddb45666f06dd42a3c3fc94574 Mon Sep 17 00:00:00 2001
+From 86ad179c5b1de7c352d65d6bd4e14294a26ba10b Mon Sep 17 00:00:00 2001
 From: Maxime Coquelin <maxime.coquelin at redhat.com>
 Date: Wed, 5 Feb 2020 16:05:29 +0100
 Subject: [PATCH] vhost: check message header size read
 
+[ upstream commit 966f89d998a20eddb45666f06dd42a3c3fc94574 ]
+
 This patch adds a check to ensure the read size of
 the Vhost-user message header is not smaller than
 the expected size.
@@ -12,7 +14,6 @@
 if any.
 
 Fixes: 8f972312b8f4 ("vhost: support vhost-user")
-Cc: stable at dpdk.org
 
 Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
 Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -22,7 +23,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
+index 4312e5e536..d224932dda 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)
@@ -33,7 +34,7 @@
 +	if (ret <= 0) {
  		return ret;
 +	} else if (ret != VHOST_USER_HDR_SIZE) {
-+		VHOST_LOG_CONFIG(ERR, "Unexpected header size read\n");
++		RTE_LOG(ERR, VHOST_CONFIG, "Unexpected header size read\n");
 +		close_msg_fds(msg);
 +		return -1;
 +	}