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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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/25/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9f9f2da932f3a6f3d5fde901841ab46f79190aa7

Thanks.

Kevin.

---
>From 9f9f2da932f3a6f3d5fde901841ab46f79190aa7 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 4c58880f8c..13606cea44 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1998,6 +1998,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) {
+		RTE_LOG(ERR, VHOST_CONFIG,
+			"Unexpected header size read\n");
+		close_msg_fds(msg);
+		return -1;
+	}
 
 	if (msg->size) {
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-19 15:43:50.562675531 +0000
+++ 0016-vhost-check-message-header-size-read.patch	2020-02-19 15:43:49.753141547 +0000
@@ -1 +1 @@
-From 966f89d998a20eddb45666f06dd42a3c3fc94574 Mon Sep 17 00:00:00 2001
+From 9f9f2da932f3a6f3d5fde901841ab46f79190aa7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 966f89d998a20eddb45666f06dd42a3c3fc94574 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -21,2 +22,2 @@
- lib/librte_vhost/vhost_user.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ lib/librte_vhost/vhost_user.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
@@ -25 +26 @@
-index 9f14ea6676..91482ccd67 100644
+index 4c58880f8c..13606cea44 100644
@@ -28 +29 @@
-@@ -2457,6 +2457,11 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
+@@ -1998,6 +1998,12 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
@@ -35 +36,2 @@
-+		VHOST_LOG_CONFIG(ERR, "Unexpected header size read\n");
++		RTE_LOG(ERR, VHOST_CONFIG,
++			"Unexpected header size read\n");