[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/4] json-streamer: Don't crash when input exceeds n
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 2/4] json-streamer: Don't crash when input exceeds nesting limit |
Date: |
Thu, 29 Oct 2015 13:44:41 +0100 |
We limit nesting depth and input size to defend against input
triggering excessive heap or stack memory use (commit 29c75dd
json-streamer: limit the maximum recursion depth and maximum token
count). However, when the nesting limit is exceeded,
parser_context_peek_token()'s assertion fails.
Broken in commit 65c0f1e "json-parser: don't replicate tokens at each
level of recursion".
To reproduce stuff 1025 open braces or brackets into QMP.
Fix by taking the error exit instead of the normal one.
Reported-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
qobject/json-streamer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index dced2c7..755c74d 100644
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -68,7 +68,7 @@ static void json_message_process_token(JSONLexer *lexer,
QString *token, JSONTok
/* Security consideration, we limit total memory allocated per object
* and the maximum recursion depth that a message can force.
*/
- goto out_emit;
+ goto out_emit_bad;
}
return;
--
2.4.3
- Re: [Qemu-devel] [PATCH 4/4] json-streamer: Limit number of tokens in addition to total size, (continued)
[Qemu-devel] [PATCH 1/4] json-streamer: Apply nesting limit more sanely, Markus Armbruster, 2015/10/29
[Qemu-devel] [PATCH 3/4] check-qjson: Add test for JSON nesting depth limit, Markus Armbruster, 2015/10/29
[Qemu-devel] [PATCH 2/4] json-streamer: Don't crash when input exceeds nesting limit,
Markus Armbruster <=