From patchwork Fri Jul 5 07:39:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 11032131 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CF38112C for ; Fri, 5 Jul 2019 07:41:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79D4C28A09 for ; Fri, 5 Jul 2019 07:41:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 681EF28A2E; Fri, 5 Jul 2019 07:41:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0B37E28A09 for ; Fri, 5 Jul 2019 07:41:35 +0000 (UTC) Received: from localhost ([::1]:50260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjIqc-0007fE-Ak for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jul 2019 03:41:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47413) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjIpX-0006jt-KL for qemu-devel@nongnu.org; Fri, 05 Jul 2019 03:40:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjIpW-000747-C1 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 03:40:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36056) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hjIpW-00070t-6M; Fri, 05 Jul 2019 03:40:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E63A33082132; Fri, 5 Jul 2019 07:40:11 +0000 (UTC) Received: from localhost (ovpn-112-40.ams2.redhat.com [10.36.112.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8418D80DA9; Fri, 5 Jul 2019 07:40:00 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 11:39:57 +0400 Message-Id: <20190705073957.2921-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 05 Jul 2019 07:40:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] usbredir: fix buffer-overflow on migration load X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , kraxel@redhat.com, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP NO_INTERFACE_INFO (255) is used to indicate no info. /home/elmarco/src/qemu/hw/usb/redirect.c:1504:71: runtime error: index 32 out of bounds for type 'uint8_t [32]' /home/elmarco/src/qemu/hw/usb/redirect.c:1503:71: runtime error: index 32 out of bounds for type 'uint8_t [32]' /home/elmarco/src/qemu/hw/usb/redirect.c:1502:68: runtime error: index 32 out of bounds for type 'uint8_t [32]' ================================================================= ==32073==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x625000252930 at pc 0x556c5126b0b6 bp 0x7fc7793ffa50 sp 0x7fc7793ffa40 READ of size 1 at 0x625000252930 thread T0 #0 0x556c5126b0b5 in usbredir_check_bulk_receiving /home/elmarco/src/qemu/hw/usb/redirect.c:1504 #1 0x556c51275a2a in usbredir_post_load /home/elmarco/src/qemu/hw/usb/redirect.c:2154 #2 0x556c51306f5e in vmstate_load_state /home/elmarco/src/qemu/migration/vmstate.c:168 #3 0x556c512efb43 in vmstate_load /home/elmarco/src/qemu/migration/savevm.c:829 #4 0x556c512f9967 in qemu_loadvm_section_start_full /home/elmarco/src/qemu/migration/savevm.c:2212 #5 0x556c512faee1 in qemu_loadvm_state_main /home/elmarco/src/qemu/migration/savevm.c:2396 #6 0x556c512fb16b in qemu_loadvm_state /home/elmarco/src/qemu/migration/savevm.c:2468 #7 0x556c512c0d2b in process_incoming_migration_co /home/elmarco/src/qemu/migration/migration.c:449 #8 0x556c51b62bcc in coroutine_trampoline /home/elmarco/src/qemu/util/coroutine-ucontext.c:115 #9 0x7fc80fba637f (/lib64/libc.so.6+0x4d37f) Cc: qemu-stable@nongnu.org Signed-off-by: Marc-André Lureau --- hw/usb/redirect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 998fc6e4b0..3bda19bd64 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1495,6 +1495,9 @@ static void usbredir_check_bulk_receiving(USBRedirDevice *dev) for (i = EP2I(USB_DIR_IN); i < MAX_ENDPOINTS; i++) { dev->endpoint[i].bulk_receiving_enabled = 0; } + if (dev->interface_info.interface_count == NO_INTERFACE_INFO) { + return; + } for (i = 0; i < dev->interface_info.interface_count; i++) { quirks = usb_get_quirks(dev->device_info.vendor_id, dev->device_info.product_id,