|
 |
9ae3a8 |
From 60ad1bad25ea99c538b745ff95e6e0a877d37d1f Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 27 Jul 2016 07:35:11 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 13/16] qjson: Limit number of tokens in addition to total size
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1469604913-12442-15-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 71476
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.3 qemu-kvm PATCH v2 13/15] qjson: Limit number of tokens in addition to total size
|
|
|
9ae3a8 |
Bugzilla: 1276036
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Commit 29c75dd "json-streamer: limit the maximum recursion depth and
|
|
|
9ae3a8 |
maximum token count" attempts to guard against excessive heap usage by
|
|
|
9ae3a8 |
limiting total token size (it says "token count", but that's a lie).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Total token size is a rather imprecise predictor of heap usage: many
|
|
|
9ae3a8 |
small tokens use more space than few large tokens with the same input
|
|
|
9ae3a8 |
size, because there's a constant per-token overhead: 37 bytes on my
|
|
|
9ae3a8 |
system.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Tighten this up: limit the token count to 2Mi. Chosen to roughly
|
|
|
9ae3a8 |
match the 64MiB total token size limit.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Message-Id: <1448486613-17634-13-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit df649835fe48f635a93316fdefe96ced7189316e)
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qobject/json-streamer.c | 2 ++
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
|
|
|
9ae3a8 |
index e87230d..a4db4b8 100644
|
|
|
9ae3a8 |
--- a/qobject/json-streamer.c
|
|
|
9ae3a8 |
+++ b/qobject/json-streamer.c
|
|
|
9ae3a8 |
@@ -16,6 +16,7 @@
|
|
|
9ae3a8 |
#include "qapi/qmp/json-streamer.h"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#define MAX_TOKEN_SIZE (64ULL << 20)
|
|
|
9ae3a8 |
+#define MAX_TOKEN_COUNT (2ULL << 20)
|
|
|
9ae3a8 |
#define MAX_NESTING (1ULL << 10)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void json_message_free_tokens(JSONMessageParser *parser)
|
|
|
9ae3a8 |
@@ -68,6 +69,7 @@ static void json_message_process_token(JSONLexer *lexer, GString *input,
|
|
|
9ae3a8 |
parser->bracket_count == 0)) {
|
|
|
9ae3a8 |
goto out_emit;
|
|
|
9ae3a8 |
} else if (parser->token_size > MAX_TOKEN_SIZE ||
|
|
|
9ae3a8 |
+ g_queue_get_length(parser->tokens) > MAX_TOKEN_COUNT ||
|
|
|
9ae3a8 |
parser->bracket_count + parser->brace_count > MAX_NESTING) {
|
|
|
9ae3a8 |
/* Security consideration, we limit total memory allocated per object
|
|
|
9ae3a8 |
* and the maximum recursion depth that a message can force.
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|