From nobody Thu Mar 28 14:02:58 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=1620118545; cv=none; d=zohomail.com; s=zohoarc; b=gWhXCC7E3cOXzAoM41dtX3IdqsSgS9+V7tWV9BZmIuiAIdVOpRFDh04VfgDe/FFH/9EN+4+WhvmF92HEQtWXOXJWhbc+33rEY4vUTTd99aUaSvBTIwEzQ2QUPMYEwaQf7cJWBpJswDCe2Zf90PzckVqi/3nmcHeBOdWbSgs8WXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620118545; 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=eJ+YtCn15wCy4YJYX/B7Kmrq/ewOQZctunu38ZfuKhE=; b=JaQ1c04Lga4wrlc+FGiQtcjjdlKTka5yS37YNYK4FQIMvHz4g42zAgNf9TsxMKvct7mv29Op7qB/Om8RWJYU/rbBg2QgVe48E4JXuu/Xl0vbv5lbaxL5V2/cWjkSJI0lCxqsorzoilOD/BYEQhsmsPreK4sKpa5tk32LIOnBZFY= 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 1620118545589821.9930631483167; Tue, 4 May 2021 01:55:45 -0700 (PDT) Received: from localhost ([::1]:59354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldqqF-0001WV-LX for importer@patchew.org; Tue, 04 May 2021 04:55:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoS-0008Bu-Eh for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoO-0005c4-Lw for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:52 -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-464-AXPrb9YgNdGYUjbxSirWwA-1; Tue, 04 May 2021 04:53:45 -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 1C4B869729; Tue, 4 May 2021 08:53:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C2725C3E0; Tue, 4 May 2021 08:53:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 93F4A1800385; Tue, 4 May 2021 10:53:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620118427; 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=eJ+YtCn15wCy4YJYX/B7Kmrq/ewOQZctunu38ZfuKhE=; b=hZ8T6BDDvMjlCDzJkhC93WL7Tul3UovcvaE0PKmm4H416XwQTfpzyIJic7kpjqJDOeCUBr NOzSlOn2pDQGbmWKsXepWiOFY1ZRNKtaCC8Vv17blj2TWVevUsT4O/58IOrG8uTqqYWhI/ gH45wohe6VqkizCuDxxhQHAZmoe96dM= X-MC-Unique: AXPrb9YgNdGYUjbxSirWwA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/7] hw/usb/host-stub: Remove unused header Date: Tue, 4 May 2021 10:53:11 +0200 Message-Id: <20210504085317.207369-2-kraxel@redhat.com> In-Reply-To: <20210504085317.207369-1-kraxel@redhat.com> References: <20210504085317.207369-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 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Paolo Bonzini , Richard Henderson , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210424224110.3442424-2-f4bug@amsat.org> Signed-off-by: Gerd Hoffmann --- hw/usb/host-stub.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c index 538ed29684cb..80809ceba542 100644 --- a/hw/usb/host-stub.c +++ b/hw/usb/host-stub.c @@ -31,7 +31,6 @@ */ =20 #include "qemu/osdep.h" -#include "ui/console.h" #include "hw/usb.h" #include "monitor/monitor.h" =20 --=20 2.31.1 From nobody Thu Mar 28 14:02:58 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=1620118689; cv=none; d=zohomail.com; s=zohoarc; b=lvi5Oy2uSbbniDnJfqfGDRtKVKDzYzR1t9OEur2OIV/6HDxxKEy+LgRY7+d5u9ZW47gYlYrz77MFpQYTGjHYnJ7VknZ8Ho2IbB5XbzyZQ0J+GPzbyfqP5VRxfmgsYBIOz0Go5JyHLmdECDpsEbq86wdfDqcBEXk0ZktFRt7efA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620118689; 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=7I6nvE9PgDTqJtNi5ocnpmYow/E+zwmJsA5Y+dscM/s=; b=MLxITfdF7yZnCw2GAgxm893cJFz4jO+bjlBWt7MOMsCGVEKIcG06GCfpFY1b/OBNLdGulfyO0lUfp4ZUQ5sS8Zp9HtshwL3UNfMqMrFDBkN0/8s5oGeO+NAkSZyJTwG7xhD034WVmsds5EUjZ0EG87LDN51gZ5fc4B9Lmw7JXbA= 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 1620118689363176.64594323204778; Tue, 4 May 2021 01:58:09 -0700 (PDT) Received: from localhost ([::1]:39154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldqsa-0004vi-AH for importer@patchew.org; Tue, 04 May 2021 04:58:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoU-0008CP-F7 for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48114) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoQ-0005dG-8w for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:54 -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-577-j2t1fLu0MLGELS8UfUYixw-1; Tue, 04 May 2021 04:53:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 470F0192377F; Tue, 4 May 2021 08:53:46 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 025CC59446; Tue, 4 May 2021 08:53:34 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A4B311800386; Tue, 4 May 2021 10:53:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620118429; 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=7I6nvE9PgDTqJtNi5ocnpmYow/E+zwmJsA5Y+dscM/s=; b=I4w0YI81WK26TVkA7yYtCz9LFDN7oF7omBFCF5oZv3edWRy5rRuANWnlAzwvvnGvtnxu4I rCLprMUTMFKKkrd0iGztBdpIuRLMDTwJgqPwtVI9uq9s3h8cofBBXCk2TWetV1+df7LcGr YD1Yfi4dpezdFaCjdlvftfc1QxxP3BM= X-MC-Unique: j2t1fLu0MLGELS8UfUYixw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/7] hw/usb: Do not build USB subsystem if not required Date: Tue, 4 May 2021 10:53:12 +0200 Message-Id: <20210504085317.207369-3-kraxel@redhat.com> In-Reply-To: <20210504085317.207369-1-kraxel@redhat.com> References: <20210504085317.207369-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Paolo Bonzini , Richard Henderson , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 If the Kconfig 'USB' value is not selected, it is pointless to build the USB core components. Add a stub for the HMP commands and usbdevice_create() which is called by usb_device_add in softmmu/vl.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210424224110.3442424-3-f4bug@amsat.org> Signed-off-by: Gerd Hoffmann --- stubs/usb-dev-stub.c | 25 +++++++++++++++++++++++++ MAINTAINERS | 1 + hw/usb/meson.build | 9 +++------ stubs/meson.build | 1 + 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 stubs/usb-dev-stub.c diff --git a/stubs/usb-dev-stub.c b/stubs/usb-dev-stub.c new file mode 100644 index 000000000000..b1adeeb4548d --- /dev/null +++ b/stubs/usb-dev-stub.c @@ -0,0 +1,25 @@ +/* + * QEMU USB device emulation stubs + * + * Copyright (C) 2021 Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "sysemu/sysemu.h" +#include "monitor/monitor.h" +#include "hw/usb.h" + +USBDevice *usbdevice_create(const char *driver) +{ + error_report("Support for USB devices not built-in"); + + return NULL; +} + +void hmp_info_usb(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "Support for USB devices not built-in\n"); +} diff --git a/MAINTAINERS b/MAINTAINERS index 4c05ff8bbabd..6f7e5db3b102 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1804,6 +1804,7 @@ USB M: Gerd Hoffmann S: Maintained F: hw/usb/* +F: stubs/usb-dev-stub.c F: tests/qtest/usb-*-test.c F: docs/usb2.txt F: docs/usb-storage.txt diff --git a/hw/usb/meson.build b/hw/usb/meson.build index fb7a74e73ae8..f357270d0b6b 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -1,17 +1,14 @@ hw_usb_modules =3D {} =20 # usb subsystem core -softmmu_ss.add(files( +softmmu_ss.add(when: 'CONFIG_USB', if_true: files( 'bus.c', 'combined-packet.c', 'core.c', - 'pcap.c', - 'libhw.c' -)) - -softmmu_ss.add(when: 'CONFIG_USB', if_true: files( 'desc.c', 'desc-msos.c', + 'libhw.c', + 'pcap.c', )) =20 # usb host adapters diff --git a/stubs/meson.build b/stubs/meson.build index be6f6d609e58..3faef16892be 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -50,6 +50,7 @@ if have_block endif if have_system stub_ss.add(files('semihost.c')) + stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) else stub_ss.add(files('qdev.c')) --=20 2.31.1 From nobody Thu Mar 28 14:02:58 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=1620118737; cv=none; d=zohomail.com; s=zohoarc; b=EskD6gLsx7iiNPKCFtpAN4wDnejFc8fVXJCGtWTB9Jn8G3qqY1JUhyEeaPgOo4FPIRAxy1qmDGF+SlymLStJ6q00zArXdJlN4gAW2QbbH6pPDQv3K8InQpZQavw/kIXV7shq6+jn5U7q0wL09pMCo+ls2Tn/mjWoFybwJ4bB518= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620118737; 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=MG8+HLYcLD6OQYXdck3O/eW9YnIf4YN4tJ6E6N4FxpQ=; b=c2xgOHgwtnyV0IYcDeLZ4ELMg8V2enaYom1LXdmW4V9VgbPk4yu5JPKp47b9k+TnvkYh5JUdlHTn//lrW+8ghy0h2PcnG2F5KLvjCK7FLLEg+TaEvz/fCOrKTDflC8S1rKF2pYqKnEa16mueiUY21ydBbA7MZbjlt7GshAFzVyc= 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 1620118737156597.0779679990048; Tue, 4 May 2021 01:58:57 -0700 (PDT) Received: from localhost ([::1]:41122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldqtK-0005lg-0y for importer@patchew.org; Tue, 04 May 2021 04:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoV-0008Dp-6T for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21209) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoS-0005e0-7j for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:54 -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-566-k6QwwBC0MwG1pblNM3HZtw-1; Tue, 04 May 2021 04:53:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8859F801B12 for ; Tue, 4 May 2021 08:53:49 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 403DC1A866; Tue, 4 May 2021 08:53:49 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B1564180062B; Tue, 4 May 2021 10:53:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620118431; 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=MG8+HLYcLD6OQYXdck3O/eW9YnIf4YN4tJ6E6N4FxpQ=; b=KcwpPyLArIMNmi6O6vbnGnSrBZ3SK6CrtI6i0GJ4jY10jlHh/lnH63Cmt+KbxoSr+HkORa W+wU+TaT0a+rBsSYxIR/aAE8+XaRc1AYteJ3HanKC1B3fQgd7RsRVDnm3f7Io3lA2ahwJw fU9fkCH5T52mJj1PX+xLU0rjhUsAbZM= X-MC-Unique: k6QwwBC0MwG1pblNM3HZtw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/7] usb/hid: avoid dynamic stack allocation Date: Tue, 4 May 2021 10:53:13 +0200 Message-Id: <20210504085317.207369-4-kraxel@redhat.com> In-Reply-To: <20210504085317.207369-1-kraxel@redhat.com> References: <20210504085317.207369-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use autofree heap allocation instead. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210503132915.2335822-2-kraxel@redhat.com> --- hw/usb/dev-hid.c | 2 +- hw/usb/dev-wacom.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index fc39bab79f94..1c7ae97c3033 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -656,7 +656,7 @@ static void usb_hid_handle_data(USBDevice *dev, USBPack= et *p) { USBHIDState *us =3D USB_HID(dev); HIDState *hs =3D &us->hid; - uint8_t buf[p->iov.size]; + g_autofree uint8_t *buf =3D g_malloc(p->iov.size); int len =3D 0; =20 switch (p->pid) { diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c index b59504863509..ed687bc9f1eb 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -301,7 +301,7 @@ static void usb_wacom_handle_control(USBDevice *dev, US= BPacket *p, static void usb_wacom_handle_data(USBDevice *dev, USBPacket *p) { USBWacomState *s =3D (USBWacomState *) dev; - uint8_t buf[p->iov.size]; + g_autofree uint8_t *buf =3D g_malloc(p->iov.size); int len =3D 0; =20 switch (p->pid) { --=20 2.31.1 From nobody Thu Mar 28 14:02:58 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=1620118688; cv=none; d=zohomail.com; s=zohoarc; b=DRW8WB2aFh0cl0gsQeOfghhswiLnIbk08aW4QvQAnj5th5JOwv6Y0g2cEJF6yE6iTsrNFrneFJgcUIXd4LVlrsy/MtR7xvJQQsxd7nc/D8D4h74Exm3yWYpcqntPSoxs3/ztL+0Yx95pXbXfjAdlyziY5KJLmTyhltsinxJM26I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620118688; 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=nPYwBw46BnBLKZc2EQxjso6vQ9RVFrLDdA1GUaPYS10=; b=bXeRwnkjzcHgwLKkuBt7N+5JUmsaw3XH/FeiwXJarAv13bgR6mZ51WPdyE3ukHTUyUCbx0a2gxOEgKaZKiu9/BPI1bYjaHubVE06/whOO7ljBXtPIy7ZKhHjnWDVbsbNb8uf5S9ntZR/mF/kCISAiyf80kBOZHS/zON4T/eQY5s= 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 1620118688352824.3394825532595; Tue, 4 May 2021 01:58:08 -0700 (PDT) Received: from localhost ([::1]:39042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldqsZ-0004sy-4D for importer@patchew.org; Tue, 04 May 2021 04:58:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoU-0008Cm-LM for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoS-0005dd-7A for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:54 -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-548-1Wpv0T5uNC-oRRsgyhVCCw-1; Tue, 04 May 2021 04:53:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 638D6107ACC7 for ; Tue, 4 May 2021 08:53:48 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 16D1A60937; Tue, 4 May 2021 08:53:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BC3321800794; Tue, 4 May 2021 10:53:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620118430; 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=nPYwBw46BnBLKZc2EQxjso6vQ9RVFrLDdA1GUaPYS10=; b=XRgjR/Lz43GW6c/+AuyJJPBC1v3xnW+eJRJCYEfDRDpghd1XGRV1Fb39R97mPN96fEvtWA No+dxtkZeMMOaL3vHv5xUKtgS+luAIhIRtAtfSxmemJKdkEo41Iu2m28kCmc8drR/bOXe1 2R+4LLuH8qbKkiofuRaa5x4gSfSDUNY= X-MC-Unique: 1Wpv0T5uNC-oRRsgyhVCCw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 4/7] usb/redir: avoid dynamic stack allocation (CVE-2021-3527) Date: Tue, 4 May 2021 10:53:14 +0200 Message-Id: <20210504085317.207369-5-kraxel@redhat.com> In-Reply-To: <20210504085317.207369-1-kraxel@redhat.com> References: <20210504085317.207369-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use autofree heap allocation instead. Fixes: 4f4321c11ff ("usb: use iovecs in USBPacket") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Gerd Hoffmann Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210503132915.2335822-3-kraxel@redhat.com> --- hw/usb/redirect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 17f06f34179a..6a75b0dc4ab2 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -620,7 +620,7 @@ static void usbredir_handle_iso_data(USBRedirDevice *de= v, USBPacket *p, .endpoint =3D ep, .length =3D p->iov.size }; - uint8_t buf[p->iov.size]; + g_autofree uint8_t *buf =3D g_malloc(p->iov.size); /* No id, we look at the ep when receiving a status back */ usb_packet_copy(p, buf, p->iov.size); usbredirparser_send_iso_packet(dev->parser, 0, &iso_packet, @@ -818,7 +818,7 @@ static void usbredir_handle_bulk_data(USBRedirDevice *d= ev, USBPacket *p, usbredirparser_send_bulk_packet(dev->parser, p->id, &bulk_packet, NULL, 0); } else { - uint8_t buf[size]; + g_autofree uint8_t *buf =3D g_malloc(size); usb_packet_copy(p, buf, size); usbredir_log_data(dev, "bulk data out:", buf, size); usbredirparser_send_bulk_packet(dev->parser, p->id, @@ -923,7 +923,7 @@ static void usbredir_handle_interrupt_out_data(USBRedir= Device *dev, USBPacket *p, uint8_t ep) { struct usb_redir_interrupt_packet_header interrupt_packet; - uint8_t buf[p->iov.size]; + g_autofree uint8_t *buf =3D g_malloc(p->iov.size); =20 DPRINTF("interrupt-out ep %02X len %zd id %"PRIu64"\n", ep, p->iov.size, p->id); --=20 2.31.1 From nobody Thu Mar 28 14:02:58 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=1620118548; cv=none; d=zohomail.com; s=zohoarc; b=n15HZ1P2vLwCyxcVDnhCDdR0or/jMHpjjBKWYBReix+bLDhbhr4hgBq3ooWW0kmO2vkUmo6s052csKqaj4CBGZ+Eu3MuMqlC4ulErVWcrmR2pgTyZEzlDHjpTizW529NxTikf3RV8XbnVeGwkP7Rlr6hpcjAsCCRIFTyq4IEZX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620118548; 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=5iBUj/I7FT92H26S+L0vtNiLZUhLn9iF24YepnZ/+EQ=; b=cyhx7v66y/NrS5vf0+idZdaKxxeDi+AbeNF4CCb0lnMi7d127yw+43O5VvGqKgqzkYyXpxHAmrqc1psScdr4otJvdEQKIerbI6H8KE07+jsL4KCJL/Z3ownAhIcL3W/MNR+s6toPLtNdCQt1J6tDSFkLX/Oi9+E/5ybLAEEfbyk= 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 1620118548748264.81690409129817; Tue, 4 May 2021 01:55:48 -0700 (PDT) Received: from localhost ([::1]:59576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldqqJ-0001bq-I3 for importer@patchew.org; Tue, 04 May 2021 04:55:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoW-0008Fp-2D for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoU-0005es-Gm for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:55 -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-560-peeGoEAxNYyWJrdkrpxe0A-1; Tue, 04 May 2021 04:53:52 -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 A10041923779 for ; Tue, 4 May 2021 08:53:51 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6876C60C0F; Tue, 4 May 2021 08:53:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C70731800795; Tue, 4 May 2021 10:53:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620118434; 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=5iBUj/I7FT92H26S+L0vtNiLZUhLn9iF24YepnZ/+EQ=; b=DEYomaLKjbf3jOxCblHRMxM95p2yAaoijJFoEl8tu62lUBZa/uSKhiD5K5YwRpxdw+Bbi/ yj2Gl0P4fh2EVqrlmsgwjGlPeqNgYbCAy7v1sxhqCx0+q0y0LLGHr8vQPHxgIShDZIN9B5 1RQsNcufWg5F7Au22hzjgSWc0Di0rM8= X-MC-Unique: peeGoEAxNYyWJrdkrpxe0A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 5/7] usb/mtp: avoid dynamic stack allocation Date: Tue, 4 May 2021 10:53:15 +0200 Message-Id: <20210504085317.207369-6-kraxel@redhat.com> In-Reply-To: <20210504085317.207369-1-kraxel@redhat.com> References: <20210504085317.207369-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use autofree heap allocation instead. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210503132915.2335822-4-kraxel@redhat.com> --- hw/usb/dev-mtp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index bbb827434482..2a895a73b083 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -907,7 +907,8 @@ static MTPData *usb_mtp_get_object_handles(MTPState *s,= MTPControl *c, MTPObject *o) { MTPData *d =3D usb_mtp_data_alloc(c); - uint32_t i =3D 0, handles[o->nchildren]; + uint32_t i =3D 0; + g_autofree uint32_t *handles =3D g_new(uint32_t, o->nchildren); MTPObject *iter; =20 trace_usb_mtp_op_get_object_handles(s->dev.addr, o->handle, o->path); --=20 2.31.1 From nobody Thu Mar 28 14:02:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620118857; cv=none; d=zohomail.com; s=zohoarc; b=MKLPHHSKa/nyvq4QR2OyK/TTdvM+aU7/UKBVHdTP/gbPudbvFw3F2WDzp08e07Ol6WMdd2qx7y6BzQfVWz8CbzuSdEckTTgFukO5Wwd572Tiy/Dob+QiBbszjnZ0alewSpp5QkPM9f1+HcIgBsKmihOK2W4Ffy1/ee9gMuQwtew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620118857; 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=VQweXaqFoK+hUmRckmAqpP6VSe2Px1zRlb77Ba02ksc=; b=mlIJA2u1mxbAAMUvBfRsB0d+cwkRxKUnG4PpTgC2UCUiSIJP3TtWB307V9GuSLQypFkGDxA+yD+qhmjwrtUFdCG/mNyXBhE2bjTKbUOHbmRe6J9maJY1Oaugvnp7kKgrS4Isj7vuAsO5yR+3mtNcMBC7UKO6RPIkvrR7phwdyB8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1620118857165836.5820213623975; Tue, 4 May 2021 02:00:57 -0700 (PDT) Received: from localhost ([::1]:45992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldqvH-0007pc-VF for importer@patchew.org; Tue, 04 May 2021 05:00:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoX-0008JD-Fk for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoV-0005f4-PN for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:57 -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-463-k5EKCpnEOMWmZ7PidF7Ieg-1; Tue, 04 May 2021 04:53:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E26571006C8E for ; Tue, 4 May 2021 08:53:51 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99C231A866; Tue, 4 May 2021 08:53:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D209818007A0; Tue, 4 May 2021 10:53:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620118435; 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=VQweXaqFoK+hUmRckmAqpP6VSe2Px1zRlb77Ba02ksc=; b=VluuYsDZgqAShUSZxafSkHm5r8oDenWlRFcXUyn6oGTZ6qh7kVMOkJ3bURd960+en+TJWB /X1TsGbV1/q3kFylno2TYaZ6BXIU1H6AcDb6C7BlOyPkU1zq/AZsF6IVeWRIlumdbKIrLP Lrl1JzO4dD9Z7UYjPkrR7lGcz6EPzok= X-MC-Unique: k5EKCpnEOMWmZ7PidF7Ieg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 6/7] usb/xhci: sanity check packet size (CVE-2021-3527) Date: Tue, 4 May 2021 10:53:16 +0200 Message-Id: <20210504085317.207369-7-kraxel@redhat.com> In-Reply-To: <20210504085317.207369-1-kraxel@redhat.com> References: <20210504085317.207369-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Paolo Bonzini , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Make sure the usb packet size is within the bounds of the endpoint configuration. Signed-off-by: Gerd Hoffmann Message-Id: <20210503132915.2335822-5-kraxel@redhat.com> --- hw/usb/hcd-xhci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 46212b1e695a..7acfb8137bc9 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -1568,6 +1568,11 @@ static int xhci_setup_packet(XHCITransfer *xfer) qemu_sglist_destroy(&xfer->sgl); return -1; } + if (xfer->packet.iov.size > ep->max_packet_size) { + usb_packet_unmap(&xfer->packet, &xfer->sgl); + qemu_sglist_destroy(&xfer->sgl); + return -1; + } DPRINTF("xhci: setup packet pid 0x%x addr %d ep %d\n", xfer->packet.pid, ep->dev->addr, ep->nr); return 0; --=20 2.31.1 From nobody Thu Mar 28 14:02:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620118557; cv=none; d=zohomail.com; s=zohoarc; b=GDH+CSaK8uptQkU/vrEJ5A3406HrtGAcRs72rExzwi0YthUT3fp/JAoK1V7WIzyRNdorS376qXPUbWY07t14JIqijg0FzHk/TUV6ua9NaiaSE9/ZK6vzeAeNfeLaHF9igvXWMH5J1x0PL0sx20lcsBw2nzBFv4qFE+P3ua26KBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620118557; 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=Ml9dSvV90BoAjVYGJB+DWuOm7SdKQR3W5okVQfvcDxQ=; b=T457j6AxLVdI6HI4FvOv+TtF781XOHz7bME0uhd3Pl9HCTpqjJhzHr9Z6MX4tg6YBEiILfbineinREvweH9sGW4kkIxgMcB2n29ZrKCKgI0MwUFSntW9g2WYx5CNgHppK4JKKNADLhjJN17hsQ9D9pzPygDtBq7YuMybweqC0Wo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1620118557494662.5228666733824; Tue, 4 May 2021 01:55:57 -0700 (PDT) Received: from localhost ([::1]:59808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldqqS-0001hX-GY for importer@patchew.org; Tue, 04 May 2021 04:55:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoY-0008N6-Jw for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqoW-0005gu-Tm for qemu-devel@nongnu.org; Tue, 04 May 2021 04:53:58 -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-590-ttvjD9pAOXW_0LJ4oetHDQ-1; Tue, 04 May 2021 04:53:54 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D51A81006C80 for ; Tue, 4 May 2021 08:53:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 95BEE1A866; Tue, 4 May 2021 08:53:53 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DCCC418007A1; Tue, 4 May 2021 10:53:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620118436; 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=Ml9dSvV90BoAjVYGJB+DWuOm7SdKQR3W5okVQfvcDxQ=; b=BA3Vqc4qiOIyVdFZl7m1WosBSmCN5sBu4UdANOMH8m8kfFlvnAKfmaNjcF9u41lrVUizqn m3qKwBdnUIBjsNKP31a/OFLtapdrjU5gILHVNgcKXL+5ATkzUM2fuTvBPNbHRj0p+Dh4Is G57rTFCrTDCz5mYNDS9rHvrXcFqjt4I= X-MC-Unique: ttvjD9pAOXW_0LJ4oetHDQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 7/7] usb: limit combined packets to 1 MiB (CVE-2021-3527) Date: Tue, 4 May 2021 10:53:17 +0200 Message-Id: <20210504085317.207369-8-kraxel@redhat.com> In-Reply-To: <20210504085317.207369-1-kraxel@redhat.com> References: <20210504085317.207369-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Paolo Bonzini , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" usb-host and usb-redirect try to batch bulk transfers by combining many small usb packets into a single, large transfer request, to reduce the overhead and improve performance. This patch adds a size limit of 1 MiB for those combined packets to restrict the host resources the guest can bind that way. Signed-off-by: Gerd Hoffmann Message-Id: <20210503132915.2335822-6-kraxel@redhat.com> --- hw/usb/combined-packet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c index 5d57e883dcb5..e56802f89a32 100644 --- a/hw/usb/combined-packet.c +++ b/hw/usb/combined-packet.c @@ -171,7 +171,9 @@ void usb_ep_combine_input_packets(USBEndpoint *ep) if ((p->iov.size % ep->max_packet_size) !=3D 0 || !p->short_not_ok= || next =3D=3D NULL || /* Work around for Linux usbfs bulk splitting + migration = */ - (totalsize =3D=3D (16 * KiB - 36) && p->int_req)) { + (totalsize =3D=3D (16 * KiB - 36) && p->int_req) || + /* Next package may grow combined package over 1MiB */ + totalsize > 1 * MiB - ep->max_packet_size) { usb_device_handle_data(ep->dev, first); assert(first->status =3D=3D USB_RET_ASYNC); if (first->combined) { --=20 2.31.1