|
 |
383d26 |
From d706e465682307df95a723e1a74b32c0db93e259 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Date: Fri, 22 Mar 2019 03:22:30 +0100
|
|
|
383d26 |
Subject: [PATCH 063/163] nbd/server: Ignore write errors when replying to
|
|
|
383d26 |
NBD_OPT_ABORT
|
|
|
383d26 |
MIME-Version: 1.0
|
|
|
383d26 |
Content-Type: text/plain; charset=UTF-8
|
|
|
383d26 |
Content-Transfer-Encoding: 8bit
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-id: <20190322032241.8111-18-jsnow@redhat.com>
|
|
|
383d26 |
Patchwork-id: 85105
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 17/28] nbd/server: Ignore write errors when replying to NBD_OPT_ABORT
|
|
|
383d26 |
Bugzilla: 1691563
|
|
|
383d26 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
From: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
Commit 37ec36f6 intentionally ignores errors when trying to reply
|
|
|
383d26 |
to an NBD_OPT_ABORT request for plaintext clients, but did not make
|
|
|
383d26 |
the same change for a TLS server. Since NBD_OPT_ABORT is
|
|
|
383d26 |
documented as being a potential for an EPIPE when the client hangs
|
|
|
383d26 |
up without waiting for our reply, we don't need to pollute the
|
|
|
383d26 |
server's output with that failure.
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
Message-Id: <20181117223221.2198751-1-eblake@redhat.com>
|
|
|
383d26 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
383d26 |
(cherry picked from commit 3e99ebb9d3df15ce0ecf1b435816c9c46ee9a1ad)
|
|
|
383d26 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
nbd/server.c | 12 ++++++++----
|
|
|
383d26 |
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/nbd/server.c b/nbd/server.c
|
|
|
383d26 |
index 418b1d4..e8fd6b4 100644
|
|
|
383d26 |
--- a/nbd/server.c
|
|
|
383d26 |
+++ b/nbd/server.c
|
|
|
383d26 |
@@ -1134,12 +1134,16 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,
|
|
|
383d26 |
return -EINVAL;
|
|
|
383d26 |
|
|
|
383d26 |
default:
|
|
|
383d26 |
- ret = nbd_opt_drop(client, NBD_REP_ERR_TLS_REQD, errp,
|
|
|
383d26 |
+ /* Let the client keep trying, unless they asked to
|
|
|
383d26 |
+ * quit. Always try to give an error back to the
|
|
|
383d26 |
+ * client; but when replying to OPT_ABORT, be aware
|
|
|
383d26 |
+ * that the client may hang up before receiving the
|
|
|
383d26 |
+ * error, in which case we are fine ignoring the
|
|
|
383d26 |
+ * resulting EPIPE. */
|
|
|
383d26 |
+ ret = nbd_opt_drop(client, NBD_REP_ERR_TLS_REQD,
|
|
|
383d26 |
+ option == NBD_OPT_ABORT ? NULL : errp,
|
|
|
383d26 |
"Option 0x%" PRIx32
|
|
|
383d26 |
" not permitted before TLS", option);
|
|
|
383d26 |
- /* Let the client keep trying, unless they asked to
|
|
|
383d26 |
- * quit. In this mode, we've already sent an error, so
|
|
|
383d26 |
- * we can't ack the abort. */
|
|
|
383d26 |
if (option == NBD_OPT_ABORT) {
|
|
|
383d26 |
return 1;
|
|
|
383d26 |
}
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|