[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/20] block/nbd: check that received handle is valid
From: |
Eric Blake |
Subject: |
[PULL 19/20] block/nbd: check that received handle is valid |
Date: |
Mon, 27 Sep 2021 16:55:44 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
If we don't have active request, that waiting for this handle to be
received, we should report an error.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210902103805.25686-6-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 8ff6daf43d46..5ef462db1b7f 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -58,6 +58,7 @@ typedef struct {
Coroutine *coroutine;
uint64_t offset; /* original offset of the request */
bool receiving; /* sleeping in the yield in nbd_receive_replies */
+ bool reply_possible; /* reply header not yet received */
} NBDClientRequest;
typedef enum NBDClientState {
@@ -415,14 +416,7 @@ static coroutine_fn int nbd_receive_replies(BDRVNBDState
*s, uint64_t handle)
return 0;
}
ind2 = HANDLE_TO_INDEX(s, s->reply.handle);
- if (ind2 >= MAX_NBD_REQUESTS || !s->requests[ind2].coroutine) {
- /*
- * We only check that ind2 request exists. But don't check
- * whether it is now waiting for the reply header or
- * not. We can't just check s->requests[ind2].receiving:
- * ind2 request may wait in trying to lock
- * receive_mutex. So that's a TODO.
- */
+ if (ind2 >= MAX_NBD_REQUESTS || !s->requests[ind2].reply_possible) {
nbd_channel_error(s, -EINVAL);
return -EINVAL;
}
@@ -468,6 +462,7 @@ static int nbd_co_send_request(BlockDriverState *bs,
s->requests[i].coroutine = qemu_coroutine_self();
s->requests[i].offset = request->from;
s->requests[i].receiving = false;
+ s->requests[i].reply_possible = true;
request->handle = INDEX_TO_HANDLE(s, i);
--
2.31.1
- [PULL 07/20] block: make BlockLimits::max_pwrite_zeroes 64bit, (continued)
- [PULL 07/20] block: make BlockLimits::max_pwrite_zeroes 64bit, Eric Blake, 2021/09/27
- [PULL 09/20] block/io: allow 64bit write-zeroes requests, Eric Blake, 2021/09/27
- [PULL 12/20] block/io: allow 64bit discard requests, Eric Blake, 2021/09/27
- [PULL 13/20] nbd/server: Allow LIST_META_CONTEXT without STRUCTURED_REPLY, Eric Blake, 2021/09/27
- [PULL 15/20] block/nbd: nbd_channel_error() shutdown channel unconditionally, Eric Blake, 2021/09/27
- [PULL 18/20] block/nbd: drop connection_co, Eric Blake, 2021/09/27
- [PULL 17/20] block/nbd: refactor nbd_recv_coroutines_wake_all(), Eric Blake, 2021/09/27
- [PULL 08/20] block: use int64_t instead of int in driver write_zeroes handlers, Eric Blake, 2021/09/27
- [PULL 14/20] nbd/client-connection: nbd_co_establish_connection(): fix non set errp, Eric Blake, 2021/09/27
- [PULL 16/20] block/nbd: move nbd_recv_coroutines_wake_all() up, Eric Blake, 2021/09/27
- [PULL 19/20] block/nbd: check that received handle is valid,
Eric Blake <=
- [PULL 20/20] nbd/server: Add --selinux-label option, Eric Blake, 2021/09/27
- Re: [PULL 00/20] NBD patches through 2021-09-27, Peter Maydell, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Paolo Bonzini, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Richard Henderson, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Paolo Bonzini, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Eric Blake, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Richard W.M. Jones, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Daniel P . Berrangé, 2021/09/30
- Re: [PULL 00/20] NBD patches through 2021-09-27, Richard W.M. Jones, 2021/09/30
- Re: [PULL 00/20] NBD patches through 2021-09-27, Richard Henderson, 2021/09/30