From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 24 Sep 2020 15:15:44 +0000 (+0100)
Subject: util/vhost-user-server: check EOF when reading payload
X-Git-Tag: v5.2.0-rc0~38^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edaf6205a3a58e09bf31b7ebd73d8fc470e96e07;p=thirdparty%2Fqemu.git

util/vhost-user-server: check EOF when reading payload

Unexpected EOF is an error that must be reported.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200924151549.913737-9-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index a7b7a9897f1..981908fef09 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -169,8 +169,10 @@ vu_message_read(VuDev *vu_dev, int conn_fd, VhostUserMsg *vmsg)
     };
     if (vmsg->size) {
         rc = qio_channel_readv_all_eof(ioc, &iov_payload, 1, &local_err);
-        if (rc == -1) {
-            error_report_err(local_err);
+        if (rc != 1) {
+            if (local_err) {
+                error_report_err(local_err);
+            }
             goto fail;
         }
     }