From: Eric Blake <eblake@redhat.com>
Date: Wed, 10 Jan 2018 23:08:22 +0000 (-0600)
Subject: nbd/server: Better error for NBD_OPT_EXPORT_NAME failure
X-Git-Tag: v2.12.0-rc0~150^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=32f158a63509656f95922ce28d1b4a4e06a2cbf2;p=users%2Fdwmw2%2Fqemu.git

nbd/server: Better error for NBD_OPT_EXPORT_NAME failure

When a client abruptly disconnects before we've finished reading
the name sent with NBD_OPT_EXPORT_NAME, we are better off logging
the failure as EIO (we can't communicate with the client), rather
than EINVAL (the client sent bogus data).

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20180110230825.18321-4-eblake@redhat.com>
---

diff --git a/nbd/server.c b/nbd/server.c
index b9efdcc605..31c1d32429 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -299,7 +299,7 @@ static int nbd_negotiate_handle_export_name(NBDClient *client,
     }
     if (nbd_read(client->ioc, name, client->optlen, errp) < 0) {
         error_prepend(errp, "read failed: ");
-        return -EINVAL;
+        return -EIO;
     }
     name[client->optlen] = '\0';
     client->optlen = 0;