From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBdt-0002Mb-06 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adBdn-00069J-Bq for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44667) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBdn-00068g-6z for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:11 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id C384B8050D for ; Tue, 8 Mar 2016 07:01:10 +0000 (UTC) From: Peter Xu Date: Tue, 8 Mar 2016 15:00:39 +0800 Message-Id: <1457420446-25276-2-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 1/8] qdict: fix unbounded stack for qdict_array_entries List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peterx@redhat.com, Luiz Capitulino Suggested-by: Paolo Bonzini CC: Luiz Capitulino Signed-off-by: Peter Xu --- qobject/qdict.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/qobject/qdict.c b/qobject/qdict.c index 9833bd0..eb602a7 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -704,17 +704,19 @@ int qdict_array_entries(QDict *src, const char *subqdict) for (i = 0; i < INT_MAX; i++) { QObject *subqobj; int subqdict_entries; - size_t slen = 32 + subqdict_len; - char indexstr[slen], prefix[slen]; +#define __SLEN_MAX (128) + char indexstr[__SLEN_MAX], prefix[__SLEN_MAX]; size_t snprintf_ret; - snprintf_ret = snprintf(indexstr, slen, "%s%u", subqdict, i); - assert(snprintf_ret < slen); + assert(__SLEN_MAX >= 32 + subqdict_len); + + snprintf_ret = snprintf(indexstr, __SLEN_MAX, "%s%u", subqdict, i); + assert(snprintf_ret < __SLEN_MAX); subqobj = qdict_get(src, indexstr); - snprintf_ret = snprintf(prefix, slen, "%s%u.", subqdict, i); - assert(snprintf_ret < slen); + snprintf_ret = snprintf(prefix, __SLEN_MAX, "%s%u.", subqdict, i); + assert(snprintf_ret < __SLEN_MAX); subqdict_entries = qdict_count_prefixed_entries(src, prefix); if (subqdict_entries < 0) { @@ -745,6 +747,7 @@ int qdict_array_entries(QDict *src, const char *subqdict) } return i; +#undef __SLEN_MAX } /** -- 2.4.3