From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Peter Xu 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> Subject: [Qemu-devel] [PATCH 6/8] usb: fix unbounded stack for usb_mtp_add_str List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Gerd Hoffmann , peterx@redhat.com 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) -- 2.4.3