From patchwork Thu Mar 10 02:35:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 8553071 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A32699F38C for ; Thu, 10 Mar 2016 02:36:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB6FE20155 for ; Thu, 10 Mar 2016 02:36:49 +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 BE6D6202B8 for ; Thu, 10 Mar 2016 02:36:48 +0000 (UTC) Received: from localhost ([::1]:45749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adqT2-0001U8-3h for patchwork-qemu-devel@patchwork.kernel.org; Wed, 09 Mar 2016 21:36:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adqS1-00004z-7Q for qemu-devel@nongnu.org; Wed, 09 Mar 2016 21:35:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adqS0-0005hl-BV for qemu-devel@nongnu.org; Wed, 09 Mar 2016 21:35:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adqS0-0005hh-6D for qemu-devel@nongnu.org; Wed, 09 Mar 2016 21:35:44 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id D35A380518 for ; Thu, 10 Mar 2016 02:35:43 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-6-29.pek2.redhat.com [10.72.6.29]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2A2ZVQF008732; Wed, 9 Mar 2016 21:35:39 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 10 Mar 2016 10:35:24 +0800 Message-Id: <1457577325-21606-2-git-send-email-peterx@redhat.com> In-Reply-To: <1457577325-21606-1-git-send-email-peterx@redhat.com> References: <1457577325-21606-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, famz@redhat.com, kraxel@redhat.com, peterx@redhat.com Subject: [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str 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 Use heap instead of stack. Signed-off-by: Peter Xu --- hw/usb/dev-mtp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 7391783..62fb7cd 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -718,7 +718,7 @@ static void usb_mtp_add_wstr(MTPData *data, const wchar_t *str) static void usb_mtp_add_str(MTPData *data, const char *str) { uint32_t len = strlen(str)+1; - wchar_t wstr[len]; + wchar_t *wstr = g_new(wchar_t, len); size_t ret; ret = mbstowcs(wstr, str, len); @@ -727,6 +727,8 @@ static void usb_mtp_add_str(MTPData *data, const char *str) } else { usb_mtp_add_wstr(data, wstr); } + + g_free(wstr); } static void usb_mtp_add_time(MTPData *data, time_t time)