From nobody Fri Apr 26 11:23:57 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=1600194442; cv=none; d=zohomail.com; s=zohoarc; b=IEQYOEXqH7lpESO2HAaFdSvBVvPr2mS4FLvtYypAQgcuZIZEP8ZQqoTVyGdY2dSnGoB9uLJd+Tkj9kqQ4V38P0FrCL4BOJ2FhQ0hqXf0ViT2eK9Y9e0kNbcZpBXZqh202ksjFyljhljBu04rAJCy46EvgIfJGshsePqywGCYGqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600194442; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V2nggmMj6cruR2lblv6M/31Rzrv76zhjnO+ozvROMME=; b=dSKV6zdmEkqXPWXF8UDDsrVohFvQVgalS3sGYtqrvIGcpnCrt45wAvp6zXc94zpX/juSL1NzkzwJaNnJMZAQME2pVF4YNLt/TPx8BSe+Xwy3LCwNBxD1hsxxAdjbNSjThAP/jTsU4T3RlwlprgO9GDpC9oNZ8dPuGQqEawDHaO8= 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 1600194442042134.7516800615066; Tue, 15 Sep 2020 11:27:22 -0700 (PDT) Received: from localhost ([::1]:42750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIFfk-000240-Vm for importer@patchew.org; Tue, 15 Sep 2020 14:27:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIFeI-0001Bw-OC for qemu-devel@nongnu.org; Tue, 15 Sep 2020 14:25:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIFeG-0004Kd-3I for qemu-devel@nongnu.org; Tue, 15 Sep 2020 14:25:50 -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-204-tnR-pLANOwuOfMfbBJ5FEw-1; Tue, 15 Sep 2020 14:25:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F3EF9AC9F1; Tue, 15 Sep 2020 18:25:09 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-229.sin2.redhat.com [10.67.116.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D036260E1C; Tue, 15 Sep 2020 18:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600194346; 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: in-reply-to:in-reply-to:references:references; bh=V2nggmMj6cruR2lblv6M/31Rzrv76zhjnO+ozvROMME=; b=HIGJqgV6XlVfW311WaNEH3XhG5lipvMmRPZxOt+sO7vXbN//ne+kFqa5ZvOJ1QAkH4/TDk Fz/XKJ3DQiMQBM94DtPbnHlunHgdfjz4xlu+PmYsiPiNZ2P8wXVIjprYJ219vf52s0ie9i O9/JULURrSPDzrTpQ/mUjR2nVcKb5u8= X-MC-Unique: tnR-pLANOwuOfMfbBJ5FEw-1 From: P J P To: Gerd Hoffmann Subject: [PATCH v2 1/2] hw: usb: hcd-ohci: check len and frame_number variables Date: Tue, 15 Sep 2020 23:52:58 +0530 Message-Id: <20200915182259.68522-2-ppandit@redhat.com> In-Reply-To: <20200915182259.68522-1-ppandit@redhat.com> References: <20200915182259.68522-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=63.128.21.124; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 11:54:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=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 , Li Qiang , QEMU Developers , Yi Ren , Yongkang Jia , Gaoning Pan 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 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 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) Update v2: one patch to fix oob access -> https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg05145.html diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 1e6e85e86a..9dc59101f9 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -731,7 +731,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 +768,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 +782,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 +987,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 From nobody Fri Apr 26 11:23:57 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=1600194532; cv=none; d=zohomail.com; s=zohoarc; b=BLiAgPbSAGOFTWmDCejDec/3ULZ3fH1OBwYEiJmGKR2IS19QjJ152Pw3KKQPpHmms3XAz5JiPl4C/5+ayBlCuPHLBUW+CjYA3TLl0xvBs6uKhl4ZAcbVFVOj+QUzqNgEjRZ8vT6/QqGHavEVzJAqQDdR/mAHtevyNN5H5e2oJf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600194532; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VbW5dAGjykzIBhl5ukmXUfXgvbqIXU0mt8/3b/qic5I=; b=eUxfEA4PEtIi6GS7ig1PJG6Okc7zgq3HX8UPE6YiZudYTfs7lS7DQH0VrJsVuzh5ZZhkk905Wwg5xi5uR5p4g1fFFnCF8DXJF0Cfmvihc7SM4gUHXhaDLljPuYbWXkMy9pf13IwGrGfPxYC2o11uD6ythO5RKFttRnAIr1vozmg= 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 1600194532661775.9626268619347; Tue, 15 Sep 2020 11:28:52 -0700 (PDT) Received: from localhost ([::1]:46262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIFhD-0003Wy-HH for importer@patchew.org; Tue, 15 Sep 2020 14:28:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIFe7-00012N-Ig for qemu-devel@nongnu.org; Tue, 15 Sep 2020 14:25:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIFe5-0004Je-AB for qemu-devel@nongnu.org; Tue, 15 Sep 2020 14:25:39 -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-349-ORnHc6ETOnqYMB_DteQPnQ-1; Tue, 15 Sep 2020 14:25:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C29689BBA9; Tue, 15 Sep 2020 18:25:13 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-229.sin2.redhat.com [10.67.116.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8538060CD0; Tue, 15 Sep 2020 18:25:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600194335; 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: in-reply-to:in-reply-to:references:references; bh=VbW5dAGjykzIBhl5ukmXUfXgvbqIXU0mt8/3b/qic5I=; b=cnEHAFTS7fk7rOAjSwhT3zpI52361eNh1xe6ZDntig7lCPL41xQa0X9CZnVX5GipgCKn/N pNJpxdQWSUXce8LdsejlqsFrdHgA9UOselU70t/25Z7slMitJ3XZ3r12+ieHV5yOQR4Jw7 7HYeikJsx4mN452b2wHxjn2emlWVuqM= X-MC-Unique: ORnHc6ETOnqYMB_DteQPnQ-1 From: P J P To: Gerd Hoffmann Subject: [PATCH v2 2/2] hw: usb: hcd-ohci: check for processed TD before retire Date: Tue, 15 Sep 2020 23:52:59 +0530 Message-Id: <20200915182259.68522-3-ppandit@redhat.com> In-Reply-To: <20200915182259.68522-1-ppandit@redhat.com> References: <20200915182259.68522-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=216.205.24.124; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:10:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=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 , Li Qiang , QEMU Developers , Yi Ren , Yongkang Jia , Gaoning Pan 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 OHCI transfer descriptors(TD), ohci_service_iso_td retires a TD if it has passed its time frame. It does not check if the TD was already processed once and holds an error code in TD_CC. It may happen if the TD list has a loop. Add check to avoid an infinite loop condition. Signed-off-by: Prasad J Pandit Reviewed-by: Li Qiang --- hw/usb/hcd-ohci.c | 4 ++++ 1 file changed, 4 insertions(+) Update v2: one patch for loop issue -> https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg05145.html diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 9dc59101f9..8b912e95d3 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -691,6 +691,10 @@ 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); --=20 2.26.2