From nobody Sat May 18 21:26:36 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=1598333854; cv=none; d=zohomail.com; s=zohoarc; b=PP2WWJClIQ+hvDa8K956U1r3r9kC0w+KxrujUO7KzNnZMAoBvFSOXPmYykEQpVzrgQJ15fM+hXksOHbiQd1FPmkmGDr95UThDf/ORuL6Imv7BpZAxvI5hMuuxVvzxlFyEkHbKCpi2r0TPs/N4JRduKNAz07XE/mLT+ZfJj1rDrw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598333854; 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=7fU5zpbSM5vcreKmXC/NArdGuxSaKbojqsfBEtqDc7Q=; b=hQkikzBJaOthtsUyLTeR30RSBhA60cmKDskgBVf8NCZxJQh+JmYx3xXOVsD+UoGlMFqCEtL6zfUMjn9B68wA5mUliM0bxu7bqIzW/M2kE6TK416rQSGiCyDP+XBm4un3PhySLbPa0OntDjNiMK5UWgt/V/weSdvzGMed5+rdPeo= 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 1598333854572673.5677472714299; Mon, 24 Aug 2020 22:37:34 -0700 (PDT) Received: from localhost ([::1]:34564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAReH-0002sz-As for importer@patchew.org; Tue, 25 Aug 2020 01:37:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kARda-0002Rb-FD for qemu-devel@nongnu.org; Tue, 25 Aug 2020 01:36:50 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43308 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 1kARdY-0006YL-T4 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 01:36: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-23-2U9NfKfwN4uS5WdObmRqWw-1; Tue, 25 Aug 2020 01:36:43 -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 30C131DDFA; Tue, 25 Aug 2020 05:36:41 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 331115FC2A; Tue, 25 Aug 2020 05:36:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E9DB31753B; Tue, 25 Aug 2020 07:36:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598333807; 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=7fU5zpbSM5vcreKmXC/NArdGuxSaKbojqsfBEtqDc7Q=; b=awqVdeoCiYvL/0Qc+JuBKrDlsR9IrJR96x9H4I6WkkX4z4JD499n6IOCcCjTcXNB/Xk9jM ZMgSFMDKydDSeXJp/3Ypxr8r0rYN3nmZYBp41uXgbjI/OT++keD/0eWj7S67uLqTRgLLpg shF2XmV1OauYxnKLbWn6Bbqu6Th2suA= X-MC-Unique: 2U9NfKfwN4uS5WdObmRqWw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH] usb: fix setup_len init (CVE-2020-14364) Date: Tue, 25 Aug 2020 07:36:36 +0200 Message-Id: <20200825053636.29648-1-kraxel@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=kraxel@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=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:36:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, 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_H4=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: Gonglei , Gerd Hoffmann 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" Store calculated setup_len in a local variable, verify it, and only write it to the struct (USBDevice->setup_len) in case it passed the sanity checks. This prevents other code (do_token_{in,out} functions specifically) from working with invalid USBDevice->setup_len values and overrunning the USBDevice->setup_buf[] buffer. Fixes: CVE-2020-14364 Signed-off-by: Gerd Hoffmann Tested-by: Gonglei Reviewed-by: Li Qiang --- hw/usb/core.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 5abd128b6bc5..5234dcc73fea 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream) static void do_token_setup(USBDevice *s, USBPacket *p) { int request, value, index; + unsigned int setup_len; =20 if (p->iov.size !=3D 8) { p->status =3D USB_RET_STALL; @@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p) usb_packet_copy(p, s->setup_buf, p->iov.size); s->setup_index =3D 0; p->actual_length =3D 0; - s->setup_len =3D (s->setup_buf[7] << 8) | s->setup_buf[6]; - if (s->setup_len > sizeof(s->data_buf)) { + setup_len =3D (s->setup_buf[7] << 8) | s->setup_buf[6]; + if (setup_len > sizeof(s->data_buf)) { fprintf(stderr, "usb_generic_handle_packet: ctrl buffer too small (%d > %z= u)\n", - s->setup_len, sizeof(s->data_buf)); + setup_len, sizeof(s->data_buf)); p->status =3D USB_RET_STALL; return; } + s->setup_len =3D setup_len; =20 request =3D (s->setup_buf[0] << 8) | s->setup_buf[1]; value =3D (s->setup_buf[3] << 8) | s->setup_buf[2]; @@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p) static void do_parameter(USBDevice *s, USBPacket *p) { int i, request, value, index; + unsigned int setup_len; =20 for (i =3D 0; i < 8; i++) { s->setup_buf[i] =3D p->parameter >> (i*8); } =20 s->setup_state =3D SETUP_STATE_PARAM; - s->setup_len =3D (s->setup_buf[7] << 8) | s->setup_buf[6]; s->setup_index =3D 0; =20 request =3D (s->setup_buf[0] << 8) | s->setup_buf[1]; value =3D (s->setup_buf[3] << 8) | s->setup_buf[2]; index =3D (s->setup_buf[5] << 8) | s->setup_buf[4]; =20 - if (s->setup_len > sizeof(s->data_buf)) { + setup_len =3D (s->setup_buf[7] << 8) | s->setup_buf[6]; + if (setup_len > sizeof(s->data_buf)) { fprintf(stderr, "usb_generic_handle_packet: ctrl buffer too small (%d > %z= u)\n", - s->setup_len, sizeof(s->data_buf)); + setup_len, sizeof(s->data_buf)); p->status =3D USB_RET_STALL; return; } + s->setup_len =3D setup_len; =20 if (p->pid =3D=3D USB_TOKEN_OUT) { usb_packet_copy(p, s->data_buf, s->setup_len); --=20 2.27.0