From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBe4-0002f2-12 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adBdy-0006PC-43 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:27 -0500 From: Peter Xu Date: Tue, 8 Mar 2016 15:00:40 +0800 Message-Id: <1457420446-25276-3-git-send-email-peterx@redhat.com> In-Reply-To: <1457420446-25276-1-git-send-email-peterx@redhat.com> References: <1457420446-25276-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 2/8] block: fix unbounded stack for dump_qdict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , pbonzini@redhat.com, qemu-block@nongnu.org, Markus Armbruster , peterx@redhat.com Suggested-by: Paolo Bonzini CC: Markus Armbruster CC: Kevin Wolf CC: qemu-block@nongnu.org Signed-off-by: Peter Xu --- block/qapi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block/qapi.c b/block/qapi.c index db2d3fb..687e577 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -638,9 +638,12 @@ static void dump_qdict(fprintf_function func_fprintf, void *f, int indentation, QType type = qobject_type(entry->value); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST); const char *format = composite ? "%*s%s:\n" : "%*s%s: "; - char key[strlen(entry->key) + 1]; +#define __KEY_LEN (256) + char key[__KEY_LEN]; int i; + assert(strlen(entry->key) + 1 <= __KEY_LEN); +#undef __KEY_LEN /* replace dashes with spaces in key (variable) names */ for (i = 0; entry->key[i]; i++) { key[i] = entry->key[i] == '-' ? ' ' : entry->key[i]; -- 2.4.3