From nobody Sat May 4 05:46:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599827467; cv=none; d=zohomail.com; s=zohoarc; b=K6+v12PvsyFSUQEKxHUE7huamwcdYepbnZO2sF0S0Q5VNm0pq1p4+1mr6jwTiwekfP4p38n3E4umC6OmSpUASENsnDmabY5e9a06wUCh94mXtMQ3df2Cz6UIVsMaliqzxuKF0iyggm+U6EjROdr8HXu2q4ZCo3Jh3Gdjh67TTFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599827467; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=zw6ebTmNottPvntqoMHMJ+3ou7u2escwtItJ8yKcHT0=; b=iPEH2xxXzJbSXuFOrL8PREW7371Fj4aEC+pWFtfxXvWyj5HOxiRQiFToTB0FD3ALW246nByh2//rwxCsZaCrQkXaGGy513cm6DLihyyawRTuyATChqCCN/t9M2Lb3VRDjVr+lHduWoXxmvqWkCKHo1W0PgjX4gLKAWcyRjMoka0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599827467041329.4159841534829; Fri, 11 Sep 2020 05:31:07 -0700 (PDT) Received: from localhost ([::1]:41056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGiCn-0002BJ-Jo for importer@patchew.org; Fri, 11 Sep 2020 08:31:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGiBO-0000uF-14 for qemu-devel@nongnu.org; Fri, 11 Sep 2020 08:29:38 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:21809 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGiBL-0000W6-6y for qemu-devel@nongnu.org; Fri, 11 Sep 2020 08:29:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-zGTIgbyKO1ibUEdqJxviGA-1; Fri, 11 Sep 2020 08:29:15 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3827380EF9E; Fri, 11 Sep 2020 12:29:14 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B60385C1BD; Fri, 11 Sep 2020 12:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599827373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zw6ebTmNottPvntqoMHMJ+3ou7u2escwtItJ8yKcHT0=; b=ZPQcEpKkc8AqN5AAeStR8FiUrJGeodx7yZwk8OBp2JmBRnbQue8/N4EKGtwz9KI2B4qvpB iyAh5nx+4C8agZ7QLeI6NKjUSeDk5A74bGwl2inEH3leduVScuzkwGV0agPbD8decIaD9c dxNJXROyoTIKUj8URD5s4iA2cRMusCw= X-MC-Unique: zGTIgbyKO1ibUEdqJxviGA-1 From: P J P To: Gerd Hoffmann Subject: [PATCH] hw: usb: hcd-ohci: check len and frame_number variables Date: Fri, 11 Sep 2020 17:57:03 +0530 Message-Id: <20200911122703.126696-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ppandit@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/11 03:40:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Prasad J Pandit , Yongkang Jia , Gaoning Pan , QEMU Developers , Yi Ren Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit While servicing the OHCI transfer descriptors(TD), OHCI host controller derives variables 'start_addr', 'end_addr', 'len' etc. from values supplied by the host controller driver. Host controller driver may supply values such that using above variables leads to out-of-bounds access or loop issues. Add checks to avoid them. AddressSanitizer: stack-buffer-overflow on address 0x7ffd53af76a0 READ of size 2 at 0x7ffd53af76a0 thread T0 #0 ohci_service_iso_td ../hw/usb/hcd-ohci.c:734 #1 ohci_service_ed_list ../hw/usb/hcd-ohci.c:1180 #2 ohci_process_lists ../hw/usb/hcd-ohci.c:1214 #3 ohci_frame_boundary ../hw/usb/hcd-ohci.c:1257 #4 timerlist_run_timers ../util/qemu-timer.c:572 #5 qemu_clock_run_timers ../util/qemu-timer.c:586 #6 qemu_clock_run_all_timers ../util/qemu-timer.c:672 #7 main_loop_wait ../util/main-loop.c:527 #8 qemu_main_loop ../softmmu/vl.c:1676 #9 main ../softmmu/main.c:50 Reported-by: Gaoning Pan Reported-by: Yongkang Jia Reported-by: Yi Ren Signed-off-by: Prasad J Pandit --- hw/usb/hcd-ohci.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 1e6e85e86a..76fb9282e3 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -691,6 +691,11 @@ static int ohci_service_iso_td(OHCIState *ohci, struct= ohci_ed *ed, the next ISO TD of the same ED */ trace_usb_ohci_iso_td_relative_frame_number_big(relative_frame_num= ber, frame_count); + if (OHCI_CC_DATAOVERRUN =3D=3D OHCI_BM(iso_td.flags, TD_CC)) { + /* avoid infinite loop */ + return 1; + } + OHCI_SET_BM(iso_td.flags, TD_CC, OHCI_CC_DATAOVERRUN); ed->head &=3D ~OHCI_DPTR_MASK; ed->head |=3D (iso_td.next & OHCI_DPTR_MASK); @@ -731,7 +736,11 @@ static int ohci_service_iso_td(OHCIState *ohci, struct= ohci_ed *ed, } =20 start_offset =3D iso_td.offset[relative_frame_number]; - next_offset =3D iso_td.offset[relative_frame_number + 1]; + if (relative_frame_number < frame_count) { + next_offset =3D iso_td.offset[relative_frame_number + 1]; + } else { + next_offset =3D iso_td.be; + } =20 if (!(OHCI_BM(start_offset, TD_PSW_CC) & 0xe) ||=20 ((relative_frame_number < frame_count) &&=20 @@ -764,7 +773,12 @@ static int ohci_service_iso_td(OHCIState *ohci, struct= ohci_ed *ed, } } else { /* Last packet in the ISO TD */ - end_addr =3D iso_td.be; + end_addr =3D next_offset; + } + + if (start_addr > end_addr) { + trace_usb_ohci_iso_td_bad_cc_overrun(start_addr, end_addr); + return 1; } =20 if ((start_addr & OHCI_PAGE_MASK) !=3D (end_addr & OHCI_PAGE_MASK)) { @@ -773,6 +787,9 @@ static int ohci_service_iso_td(OHCIState *ohci, struct = ohci_ed *ed, } else { len =3D end_addr - start_addr + 1; } + if (len > sizeof(ohci->usb_buf)) { + len =3D sizeof(ohci->usb_buf); + } =20 if (len && dir !=3D OHCI_TD_DIR_IN) { if (ohci_copy_iso_td(ohci, start_addr, end_addr, ohci->usb_buf, le= n, @@ -975,8 +992,16 @@ static int ohci_service_td(OHCIState *ohci, struct ohc= i_ed *ed) if ((td.cbp & 0xfffff000) !=3D (td.be & 0xfffff000)) { len =3D (td.be & 0xfff) + 0x1001 - (td.cbp & 0xfff); } else { + if (td.cbp > td.be) { + trace_usb_ohci_iso_td_bad_cc_overrun(td.cbp, td.be); + ohci_die(ohci); + return 1; + } len =3D (td.be - td.cbp) + 1; } + if (len > sizeof(ohci->usb_buf)) { + len =3D sizeof(ohci->usb_buf); + } =20 pktlen =3D len; if (len && dir !=3D OHCI_TD_DIR_IN) { --=20 2.26.2