[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 5/5] block/nbd: check that received handle is valid
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v6 5/5] block/nbd: check that received handle is valid |
Date: |
Thu, 2 Sep 2021 13:38:05 +0300 |
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>
---
block/nbd.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 170a8c8eeb..306b2de9f2 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,16 +416,11 @@ 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 is it
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;
}
+ s->requests[ind2].reply_possible = false;
nbd_recv_coroutine_wake_one(&s->requests[ind2]);
}
}
@@ -467,6 +463,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.29.2
- [PATCH v6 0/5] block/nbd: drop connection_co, Vladimir Sementsov-Ogievskiy, 2021/09/02
- [PATCH v6 1/5] block/nbd: nbd_channel_error() shutdown channel unconditionally, Vladimir Sementsov-Ogievskiy, 2021/09/02
- [PATCH v6 2/5] block/nbd: move nbd_recv_coroutines_wake_all() up, Vladimir Sementsov-Ogievskiy, 2021/09/02
- [PATCH v6 3/5] block/nbd: refactor nbd_recv_coroutines_wake_all(), Vladimir Sementsov-Ogievskiy, 2021/09/02
- [PATCH v6 4/5] block/nbd: drop connection_co, Vladimir Sementsov-Ogievskiy, 2021/09/02
- [PATCH v6 5/5] block/nbd: check that received handle is valid,
Vladimir Sementsov-Ogievskiy <=
- Re: [PATCH v6 0/5] block/nbd: drop connection_co, Vladimir Sementsov-Ogievskiy, 2021/09/22