From patchwork Tue Mar 8 07:00:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 8530061 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 03F6BC0553 for ; Tue, 8 Mar 2016 07:03:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 745652017D for ; Tue, 8 Mar 2016 07:03:32 +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 CC41A2015E for ; Tue, 8 Mar 2016 07:03:31 +0000 (UTC) Received: from localhost ([::1]:60760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBg3-0006Uf-6K for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Mar 2016 02:03:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBeJ-0003Bb-Jw for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adBeG-0006VZ-EZ for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBeG-0006VV-8q for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:40 -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 D4DE746217 for ; Tue, 8 Mar 2016 07:01:39 +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 u2870qvQ019713; Tue, 8 Mar 2016 02:01:36 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Tue, 8 Mar 2016 15:00:44 +0800 Message-Id: <1457420446-25276-7-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, Gerd Hoffmann , peterx@redhat.com Subject: [Qemu-devel] [PATCH 6/8] usb: fix unbounded stack 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 Suggested-by: Paolo Bonzini CC: Gerd Hoffmann Signed-off-by: Peter Xu --- hw/usb/dev-mtp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index e6dae2f..40fe26e 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -718,16 +718,20 @@ static void usb_mtp_add_wstr(MTPData *data, const wchar_t *str) static void usb_mtp_add_str(MTPData *data, const char *str) { +#define __WSTR_LEN (256) uint32_t len = strlen(str)+1; - wchar_t wstr[len]; + wchar_t wstr[__WSTR_LEN]; size_t ret; + assert(len <= __WSTR_LEN); + ret = mbstowcs(wstr, str, len); if (ret == -1) { usb_mtp_add_wstr(data, L"Oops"); } else { usb_mtp_add_wstr(data, wstr); } +#undef __WSTR_LEN } static void usb_mtp_add_time(MTPData *data, time_t time)