From patchwork Mon Mar 21 11:10:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 8631651 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 6C21E9F372 for ; Mon, 21 Mar 2016 11:10:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFA73202C8 for ; Mon, 21 Mar 2016 11:10:54 +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 9C387202F2 for ; Mon, 21 Mar 2016 11:10:52 +0000 (UTC) Received: from localhost ([::1]:56973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahxjX-0006qU-MN for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Mar 2016 07:10:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahxjJ-0006pt-CG for qemu-devel@nongnu.org; Mon, 21 Mar 2016 07:10:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahxjF-0001ip-9x for qemu-devel@nongnu.org; Mon, 21 Mar 2016 07:10:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahxjF-0001iX-3u for qemu-devel@nongnu.org; Mon, 21 Mar 2016 07:10:33 -0400 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 D74F8C062C96 for ; Mon, 21 Mar 2016 11:10:32 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-44.ams2.redhat.com [10.36.116.44]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2LBAVxk004727; Mon, 21 Mar 2016 07:10:32 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 9829B81B8E; Mon, 21 Mar 2016 12:10:30 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 21 Mar 2016 12:10:21 +0100 Message-Id: <1458558624-6890-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1458558624-6890-1-git-send-email-kraxel@redhat.com> References: <1458558624-6890-1-git-send-email-kraxel@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: Gerd Hoffmann , Peter Xu Subject: [Qemu-devel] [PULL 3/6] 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 From: Peter Xu Use heap instead of stack. Signed-off-by: Peter Xu Signed-off-by: Gerd Hoffmann --- 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)