From patchwork Tue Mar 8 07:00:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 8529991 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F1F78C0553 for ; Tue, 8 Mar 2016 07:01:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 673962017D for ; Tue, 8 Mar 2016 07:01:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A4B0A2015E for ; Tue, 8 Mar 2016 07:01:29 +0000 (UTC) Received: from localhost ([::1]:60735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBe5-0002Td-67 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Mar 2016 02:01:29 -0500 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) Received: from pxdev.xzpeter.org.com (vpn1-5-232.pek2.redhat.com [10.72.5.232]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2870qvL019713; Tue, 8 Mar 2016 02:01:06 -0500 From: Peter Xu To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, peterx@redhat.com, Luiz Capitulino Subject: [Qemu-devel] [PATCH 1/8] qdict: fix unbounded stack for qdict_array_entries X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 } /**