diff options
| author | John Levon <john.levon@nutanix.com> | 2021-02-15 15:47:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 15:47:28 +0000 |
| commit | fa3ac106ad0b6ae78bfba0ff81a296c0ac2257cc (patch) | |
| tree | a109abeff3e77cd7f7c47a9081fbe8781075fb44 | |
| parent | 62b681a42879db18ee7c8b64e750b639a92f6f8d (diff) | |
| download | libvfio-user-fa3ac106ad0b6ae78bfba0ff81a296c0ac2257cc.zip libvfio-user-fa3ac106ad0b6ae78bfba0ff81a296c0ac2257cc.tar.gz libvfio-user-fa3ac106ad0b6ae78bfba0ff81a296c0ac2257cc.tar.bz2 | |
implement server-side max_msg_size (#323)
Pick an arbitrary limit of 65536, and report it back.
Signed-off-by: John Levon <john.levon@nutanix.com>
Reviewed-by: Swapnil Ingle <swapnil.ingle@nutanix.com>
| -rw-r--r-- | lib/tran_sock.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/tran_sock.c b/lib/tran_sock.c index 419588d..7d2db0e 100644 --- a/lib/tran_sock.c +++ b/lib/tran_sock.c @@ -51,6 +51,8 @@ // FIXME: is this the value we want? #define SERVER_MAX_FDS 8 +#define SERVER_MAX_MSG_SIZE 65536 + typedef struct { int listen_fd; int conn_fd; @@ -648,19 +650,22 @@ send_version(vfu_ctx_t *vfu_ctx, int sock, uint16_t msg_id, slen = snprintf(server_caps, sizeof (server_caps), "{" "\"capabilities\":{" - "\"max_fds\":%u" + "\"max_fds\":%u," + "\"max_msg_size\":%u" "}" - "}", SERVER_MAX_FDS); + "}", SERVER_MAX_FDS, SERVER_MAX_MSG_SIZE); } else { slen = snprintf(server_caps, sizeof (server_caps), "{" "\"capabilities\":{" "\"max_fds\":%u," + "\"max_msg_size\":%u," "\"migration\":{" "\"pgsize\":%zu" "}" "}" - "}", SERVER_MAX_FDS, migration_get_pgsize(vfu_ctx->migration)); + "}", SERVER_MAX_FDS, SERVER_MAX_MSG_SIZE, + migration_get_pgsize(vfu_ctx->migration)); } // FIXME: we should save the client minor here, and check that before trying @@ -766,10 +771,16 @@ tran_sock_recv_body(vfu_ctx_t *vfu_ctx, const struct vfio_user_header *hdr, assert(vfu_ctx->tran_data != NULL); assert(hdr != NULL); + if (hdr->msg_size > SERVER_MAX_MSG_SIZE) { + vfu_log(vfu_ctx, LOG_ERR, "msg%#hx: size of %u is too large", + hdr->msg_id, hdr->msg_size); + return -EINVAL; + } + ts = vfu_ctx->tran_data; body_size = hdr->msg_size - sizeof (*hdr); - // FIXME: should check max-msg-size + data = malloc(body_size); if (data == NULL) { |