OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

nbd/server: Prepare to receive extended header requests

Browse Source 
Although extended mode is not yet enabled, once we do turn it on, we
need to accept extended requests for all messages.  Previous patches
have already taken care of supporting 64-bit lengths, now we just need
to read it off the wire.

Note that this implementation will block indefinitely on a buggy
client that sends a non-extended payload (that is, we try to read a
full packet before we ever check the magic number, but a client that
mistakenly sends a simple request after negotiating extended headers
doesn't send us enough bytes), but it's no different from any other
client that stops talking to us partway through a packet and thus not
worth coding around.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20230925192229.3186470-16-eblake@redhat.com>
This commit is contained in:
Eric Blake 2023-09-25 14:22:32 -05:00
parent 009cd86650
commit c8720ca03e
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nbd/nbd-internal.h
View File

@ -34,8 +34,11 @@
* https://github.com/yoe/nbd/blob/master/doc/proto.md * https://github.com/yoe/nbd/blob/master/doc/proto.md
*/ */
/* Size of all NBD_OPT_*, without payload */ /* Size of all compact NBD_CMD_*, without payload */
#define NBD_REQUEST_SIZE (4 + 2 + 2 + 8 + 8 + 4) #define NBD_REQUEST_SIZE (4 + 2 + 2 + 8 + 8 + 4)
/* Size of all extended NBD_CMD_*, without payload */
#define NBD_EXTENDED_REQUEST_SIZE (4 + 2 + 2 + 8 + 8 + 8)
/* Size of all NBD_REP_* sent in answer to most NBD_OPT_*, without payload */ /* Size of all NBD_REP_* sent in answer to most NBD_OPT_*, without payload */
#define NBD_REPLY_SIZE (4 + 4 + 8) #define NBD_REPLY_SIZE (4 + 4 + 8)
/* Size of reply to NBD_OPT_EXPORT_NAME */ /* Size of reply to NBD_OPT_EXPORT_NAME */

43
nbd/server.c
View File

@ -1411,11 +1411,13 @@ nbd_read_eof(NBDClient *client, void *buffer, size_t size, Error **errp)
static int coroutine_fn nbd_receive_request(NBDClient *client, NBDRequest *request, static int coroutine_fn nbd_receive_request(NBDClient *client, NBDRequest *request,
Error **errp) Error **errp)
{ {
uint8_t buf[NBD_REQUEST_SIZE]; uint8_t buf[NBD_EXTENDED_REQUEST_SIZE];
uint32_t magic; uint32_t magic, expect;
int ret; int ret;
size_t size = client->mode >= NBD_MODE_EXTENDED ?
NBD_EXTENDED_REQUEST_SIZE : NBD_REQUEST_SIZE;
ret = nbd_read_eof(client, buf, sizeof(buf), errp); ret = nbd_read_eof(client, buf, size, errp);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -1423,13 +1425,21 @@ static int coroutine_fn nbd_receive_request(NBDClient *client, NBDRequest *reque
return -EIO; return -EIO;
} }
/* Request /*
[ 0 .. 3] magic (NBD_REQUEST_MAGIC) * Compact request
[ 4 .. 5] flags (NBD_CMD_FLAG_FUA, ...) * [ 0 .. 3] magic (NBD_REQUEST_MAGIC)
[ 6 .. 7] type (NBD_CMD_READ, ...) * [ 4 .. 5] flags (NBD_CMD_FLAG_FUA, ...)
[ 8 .. 15] cookie * [ 6 .. 7] type (NBD_CMD_READ, ...)
[16 .. 23] from * [ 8 .. 15] cookie
[24 .. 27] len * [16 .. 23] from
* [24 .. 27] len
* Extended request
* [ 0 .. 3] magic (NBD_EXTENDED_REQUEST_MAGIC)
* [ 4 .. 5] flags (NBD_CMD_FLAG_FUA, NBD_CMD_FLAG_PAYLOAD_LEN, ...)
* [ 6 .. 7] type (NBD_CMD_READ, ...)
* [ 8 .. 15] cookie
* [16 .. 23] from
* [24 .. 31] len
*/ */
magic = ldl_be_p(buf); magic = ldl_be_p(buf);
@ -1437,13 +1447,20 @@ static int coroutine_fn nbd_receive_request(NBDClient *client, NBDRequest *reque
request->type = lduw_be_p(buf + 6); request->type = lduw_be_p(buf + 6);
request->cookie = ldq_be_p(buf + 8); request->cookie = ldq_be_p(buf + 8);
request->from = ldq_be_p(buf + 16); request->from = ldq_be_p(buf + 16);
request->len = (uint32_t)ldl_be_p(buf + 24); /* widen 32 to 64 bits */ if (client->mode >= NBD_MODE_EXTENDED) {
request->len = ldq_be_p(buf + 24);
expect = NBD_EXTENDED_REQUEST_MAGIC;
} else {
request->len = (uint32_t)ldl_be_p(buf + 24); /* widen 32 to 64 bits */
expect = NBD_REQUEST_MAGIC;
}
trace_nbd_receive_request(magic, request->flags, request->type, trace_nbd_receive_request(magic, request->flags, request->type,
request->from, request->len); request->from, request->len);
if (magic != NBD_REQUEST_MAGIC) { if (magic != expect) {
error_setg(errp, "invalid magic (got 0x%" PRIx32 ")", magic); error_setg(errp, "invalid magic (got 0x%" PRIx32 ", expected 0x%"
PRIx32 ")", magic, expect);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;