From patchwork Fri Aug 28 08:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 275326 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8CB4C433E7 for ; Fri, 28 Aug 2020 08:12:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 70E6F20665 for ; Fri, 28 Aug 2020 08:12:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jLJQbRAQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70E6F20665 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBZVD-0000Ej-LV for qemu-devel@archiver.kernel.org; Fri, 28 Aug 2020 04:12:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBZRU-0000XU-NZ for qemu-devel@nongnu.org; Fri, 28 Aug 2020 04:09:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBZRR-0003Rx-W5 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 04:09:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598602137; 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=VnJxf2VwoZ85ORFrk0q2WXNQdCOZlh85AWkbifoQuNk=; b=jLJQbRAQy/Mq6IxYjWMpoaUgS5dBXxiUqYvltrjklN7VM5qvu8lPKpaqaguQ3apqaRN/O1 a7LrIVJDZ0GiwpzYG3qEu751tHnXSz+oXn3wZ7wzuGMnf6SMmm1SPy7GIUrPWIYpgwR1Kk wTYxmusTTYS+Z+Zm8MR22vPrCT9cEGU= 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-155-Opxyl2qCP4SVFekMZb3L2A-1; Fri, 28 Aug 2020 04:08:50 -0400 X-MC-Unique: Opxyl2qCP4SVFekMZb3L2A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 159B51084C96 for ; Fri, 28 Aug 2020 08:08:50 +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 D2AF57D66C; Fri, 28 Aug 2020 08:08:46 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DA5849C87; Fri, 28 Aug 2020 10:08:45 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 00/18] Usb 20200828 patches Date: Fri, 28 Aug 2020 10:08:27 +0200 Message-Id: <20200828080845.28287-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 02:09:03 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.959, 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: Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?b?w6k=?= , Gerd Hoffmann , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The following changes since commit 19591e9e0938ea5066984553c256a043bd5d822f: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (= 2020-08-27 16:59:02 +0100) are available in the Git repository at: git://git.kraxel.org/qemu tags/usb-20200828-pull-request for you to fetch changes up to 51a3da5b6398dcad7655e9cd6052eb52e6c31d21: usb: fix setup_len init (CVE-2020-14364) (2020-08-28 07:20:21 +0200) ---------------------------------------------------------------- usb: usb_packet_map fixes for ehci and xhci. usb: u2f key support (GSoC), 32bit build fixed. usb: setup_len fix (CVE-2020-14364). ---------------------------------------------------------------- C=C3=A9sar Belley (12): hw/usb: Regroup USB HID protocol values docs: Add USB U2F key device documentation hw/usb: Add U2F key base class hw/usb: Add U2F key base class implementation hw/usb: Add U2F key passthru mode hw/usb: Add U2F key emulated mode meson: Add U2F key to meson docs/system: Add U2F key to the USB devices examples docs/qdev-device-use.txt: Add USB U2F key to the QDEV devices examples scripts: Add u2f-setup-gen script hw/usb: Add U2F device check to passthru mode hw/usb: Add U2F device autoscan to passthru mode Gerd Hoffmann (3): ehci: drop pointless warn_report for guest bugs. usb-host: workaround libusb bug usb: fix setup_len init (CVE-2020-14364) Li Qiang (3): hw: xhci: check return value of 'usb_packet_map' hw: ehci: destroy sglist in error path hw: ehci: check return value of 'usb_packet_map' configure | 8 +- docs/qdev-device-use.txt | 1 + docs/u2f.txt | 110 ++++++++ meson_options.txt | 1 + scripts/u2f-setup-gen.py | 170 ++++++++++++ hw/usb/u2f.h | 92 +++++++ include/hw/usb/hid.h | 17 ++ hw/usb/core.c | 16 +- hw/usb/dev-hid.c | 26 +- hw/usb/dev-wacom.c | 12 +- hw/usb/hcd-ehci.c | 12 +- hw/usb/hcd-xhci.c | 5 +- hw/usb/host-libusb.c | 37 ++- hw/usb/u2f-emulated.c | 405 ++++++++++++++++++++++++++++ hw/usb/u2f-passthru.c | 551 +++++++++++++++++++++++++++++++++++++++ hw/usb/u2f.c | 352 +++++++++++++++++++++++++ docs/system/usb.rst | 3 + hw/usb/Kconfig | 5 + hw/usb/meson.build | 7 + meson.build | 7 + 20 files changed, 1797 insertions(+), 40 deletions(-) create mode 100644 docs/u2f.txt create mode 100755 scripts/u2f-setup-gen.py create mode 100644 hw/usb/u2f.h create mode 100644 include/hw/usb/hid.h create mode 100644 hw/usb/u2f-emulated.c create mode 100644 hw/usb/u2f-passthru.c create mode 100644 hw/usb/u2f.c --=20 2.27.0