From nobody Sat May 18 06:04:10 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=1594649740; cv=none; d=zohomail.com; s=zohoarc; b=Q4mT4A2kbOcZL+Kxz8922DRirJSTFz/89AHuPeFkeEamgMaSN8v37WMT+CyvMILcQG/45zjuVSaueKBMld5UdH+SfUg+uSc/OVjA/Yol03bSmdaMfbTHTAmYoAkviVkQRoQ3SNnbCV9V7fa+2zFxplHW71GJh9NtBoiHQiZoi5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649740; 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=/sDGej+C5cxprRRXVaQrWzRIcyZUE7Yr6mfIQ+XUx9Q=; b=a214aUTlJMMelTDY3YhMrlPA461Jb3T4xaVtGzQBVSbQVEOr1y3HbQUKt6GFuNWunTDac4KKDcb382R5lyxJpsDzTyX7avJEyPLcF8Hjys18Dw5jax0Yblm+1Qo3tjWMdpCPbpBJTOexgn5pkh3KZyE/FziBGlXeCxFPmGcavRs= 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 1594649740387341.46487365466464; Mon, 13 Jul 2020 07:15:40 -0700 (PDT) Received: from localhost ([::1]:38508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzF4-0004bS-Pt for importer@patchew.org; Mon, 13 Jul 2020 10:15:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAe-0004fo-3Z for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41671 helo=us-smtp-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 1juzAb-0006a2-H7 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:03 -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-506-u3uV7qeSNNOWatLgm9hhUQ-1; Mon, 13 Jul 2020 10:10:54 -0400 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 71D3D8027E2; Mon, 13 Jul 2020 14:10:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0264C73029; Mon, 13 Jul 2020 14:10:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1FD6E3EBB8; Mon, 13 Jul 2020 16:10:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594649460; 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=/sDGej+C5cxprRRXVaQrWzRIcyZUE7Yr6mfIQ+XUx9Q=; b=OR/3nQpCrtHREKfqdEJ+DhBx+Kr19c/bW0SPv4IxpqxkfJVk/vlWkl7rrlT+Hfg+9mZy3C +rPQLeWxWuh6QYzek0w5tnGnFz71sdtQNvrSMNZ9GopbVNneTZTpdeq1bkDc+cMUMa1KKp HMbgT+J+LGYQJPw2f/zCTZcIdiWo3yM= X-MC-Unique: u3uV7qeSNNOWatLgm9hhUQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/4] ossaudio: fix out of bounds write Date: Mon, 13 Jul 2020 16:10:46 +0200 Message-Id: <20200713141049.2241-2-kraxel@redhat.com> In-Reply-To: <20200713141049.2241-1-kraxel@redhat.com> References: <20200713141049.2241-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 03:20:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, 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?Volker=20R=C3=BCmelin?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Volker R=C3=BCmelin In function oss_read() a read error currently does not exit the read loop. With no data to read the variable pos will quickly underflow and a subsequent successful read overwrites memory outside the buffer. This patch adds the missing break statement to the error path of the function. To reproduce start qemu with -audiodev oss,id=3Daudio0 and in the guest start audio recording. After some time this will trigger an exception. Fixes: 3ba4066d08 "ossaudio: port to the new audio backend api" Signed-off-by: Volker R=C3=BCmelin Message-id: 20200707180836.5435-1-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann --- audio/ossaudio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/audio/ossaudio.c b/audio/ossaudio.c index f88d076ec236..a7dcaa31adeb 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -691,6 +691,7 @@ static size_t oss_read(HWVoiceIn *hw, void *buf, size_t= len) len, dst); break; } + break; } =20 pos +=3D nread; --=20 2.18.4 From nobody Sat May 18 06:04:10 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=1594649537; cv=none; d=zohomail.com; s=zohoarc; b=W0lY9T5kgD2ANA/UWcPmQKGzQBrLR7maTucfpwPoHYWPXodZ8aOmB7SunkkiCCxEDT4kdSY1upKeyZ/UOG62vbB/o2AhgEc8Q4p8+771D3CIu69ePhbYE7jaQPZY2FOpDkYKMSm5nNdJUTAj8gCZR3YspCqr5wCNg5qKxD8ztoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649537; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=YYKkuxz1L82bepkVHwfJi/gR2rbiaG98J1TwbK5Ss2M=; b=hD41GJM7R/nf38jZj8Vlald5RI3JzuKa/pws8OSZPq1Fdc1f3wI/9fUNd1PYZzNiXjrN15CI3Yu1Bn3h1XHQoHtxCk/l1asjijy8tlsDEINqqZ5JI2ZFdjjvVwy45Ow8AOMhQvhUTPcIo1ocBsgD5+7nnTbKbxMTuz1Nqz09gU8= 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 15946495377631006.0217716899379; Mon, 13 Jul 2020 07:12:17 -0700 (PDT) Received: from localhost ([::1]:49758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzBo-0006Ez-DB for importer@patchew.org; Mon, 13 Jul 2020 10:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAZ-0004bf-Dy for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:10:59 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:51606 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 1juzAW-0006ZB-PX for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:10:59 -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-367-oMK5yRvbNiyxKB_8fC-E9A-1; Mon, 13 Jul 2020 10:10: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 301E81085 for ; Mon, 13 Jul 2020 14:10:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 058802B6DD; Mon, 13 Jul 2020 14:10:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2917F3F119; Mon, 13 Jul 2020 16:10:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594649455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=YYKkuxz1L82bepkVHwfJi/gR2rbiaG98J1TwbK5Ss2M=; b=F00FZg94YHu5iFWIz1CZhHVvDj1/WFTqdyuekl/vA7X9nyE+qrAWdj0xyHNeKaJ4bGnU45 b2WT1d2vhwz1ZlmBeITXM1JkLU2pg+BZc/gxVbtbOFIIiOX29x77roaYNvnWnKvOF8iTiJ hZWdleQspRNVUhGEURMeJv+aiLtVrbw= X-MC-Unique: oMK5yRvbNiyxKB_8fC-E9A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/4] docs/qdev-device-use: Clean up the sentences related to -usbdevice Date: Mon, 13 Jul 2020 16:10:47 +0200 Message-Id: <20200713141049.2241-3-kraxel@redhat.com> In-Reply-To: <20200713141049.2241-1-kraxel@redhat.com> References: <20200713141049.2241-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/07/13 02:19:41 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=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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 , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Most of the -usbdevice paramaters have been removed already. Update the doc accordingly. Signed-off-by: Thomas Huth Message-id: 20200710065520.24784-1-thuth@redhat.com Signed-off-by: Gerd Hoffmann --- docs/qdev-device-use.txt | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 4bbbcf561f2f..f8d0d2fe297a 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -125,12 +125,7 @@ The -device argument differs in detail for each type o= f drive: =20 * if=3Dpflash, if=3Dmtd, if=3Dsd, if=3Dxen are not yet available with -dev= ice =20 -For USB devices, the old way is actually different: - - -usbdevice disk:format=3DFMT:FILENAME - -Provides much less control than -drive's OPTS... The new way fixes -that: +For USB storage devices, you can use something like: =20 -device usb-storage,drive=3DDRIVE-ID,removable=3DRMB =20 @@ -177,8 +172,6 @@ The appropriate DEVNAME depends on the machine type. F= or type "pc": =20 This lets you control I/O ports and IRQs. =20 -* -usbdevice serial::chardev becomes -device usb-serial,chardev=3Ddev. - * -usbdevice braille doesn't support LEGACY-CHARDEV syntax. It always uses "braille". With -device, this useful default is gone, so you have to use something like @@ -238,10 +231,6 @@ The old way to define the guest part looks like this: =20 -net nic,netdev=3DNET-ID,macaddr=3DMACADDR,model=3DMODEL,name=3DID,add= r=3DSTR,vectors=3DV =20 -Except for USB it looks like this: - - -usbdevice net:netdev=3DNET-ID,macaddr=3DMACADDR,name=3DID - The new way is -device: =20 -device DEVNAME,netdev=3DNET-ID,mac=3DMACADDR,DEV-OPTS... @@ -336,12 +325,7 @@ The new way is -device DEVNAME,DEV-OPTS... Details de= pend on DRIVER: * mouse -device usb-mouse * tablet -device usb-tablet * wacom-tablet -device usb-wacom-tablet -* host:... See "Host Device Assignment" -* disk:... See "Block Devices" -* serial:... See "Character Devices" * braille See "Character Devices" -* net:... See "Network Devices" -* bt:... not yet available with -device =20 =3D=3D=3D Watchdog Devices =3D=3D=3D =20 @@ -358,17 +342,11 @@ and host USB devices. PCI devices can only be assign= ed with -device: =20 -device vfio-pci,host=3DADDR,id=3DID =20 -The old way to assign a host USB device is - - -usbdevice host:auto:BUS.ADDR:VID:PRID - -where any of BUS, ADDR, VID, PRID can be the wildcard *. - -The new way is +To assign a host USB device use: =20 -device usb-host,hostbus=3DBUS,hostaddr=3DADDR,vendorid=3DVID,producti= d=3DPRID =20 -Omitted options match anything, just like the old way's wildcard. +Omitted options match anything. =20 =3D=3D=3D Default Devices =3D=3D=3D =20 --=20 2.18.4 From nobody Sat May 18 06:04:10 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=1594649537; cv=none; d=zohomail.com; s=zohoarc; b=X4UgVQohnplUdbrMrB6whBU+NentRdsz3ujfwW7maEncREFL7iBGaFYpqnloHyQtgirFHUry/QRUhHj6zMhTi4ayDY2nPyKwRD7JyWxr3wGVJrK6ZAnTv3lTRh2Vpu4bB29t80rlZPyO0PLR7W1LM+Hr9oXvOtr8mDdWAmOVIxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649537; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ma574VSKhZuu56MlEF6B4gIcqKvOYKPIygT95t5Oglc=; b=eKpaKxLcSNeZCJvhDlaZmlEsLNAND9disqP850LXJjNcaCz1EYmgaNB3oAQfpBDeaVCLLgD5Vl/kbs9SAvUxwNwtxumqXqTg0w9BVE5AvnWiyqXrUBB1AAWtk/vtvcBaxS5aZ8adGhctDzy+W0S90NzF9zRigQX0mrBO75TME4A= 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 1594649537853694.8567492207659; Mon, 13 Jul 2020 07:12:17 -0700 (PDT) Received: from localhost ([::1]:49890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzBo-0006IC-LF for importer@patchew.org; Mon, 13 Jul 2020 10:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAa-0004bm-GO for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:00 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59000 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 1juzAW-0006ZD-Gn for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:00 -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-193-h-rT5Px4N8yL0HJcdBrtPw-1; Mon, 13 Jul 2020 10:10:54 -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 58CA018FF66C for ; Mon, 13 Jul 2020 14:10:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1EB85C3E7; Mon, 13 Jul 2020 14:10:49 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 31F563F126; Mon, 13 Jul 2020 16:10:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594649455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=ma574VSKhZuu56MlEF6B4gIcqKvOYKPIygT95t5Oglc=; b=LoJf5t/vYQCtZwy5Xnd2UCkgUDl5Cd54TC2ToQ5HZehNqnxzQWAA2VLJo1Jcj1W06S29Hp fF2FQfm0o7Ur057r6kv6FtSbqBZDhQGNsUxYb6sxQcbhw5dhFLPTIaXlLhAHgHfCe4pd49 i1BjSixWIjFh+v+6S6lpVg5JjqdoHoI= X-MC-Unique: h-rT5Px4N8yL0HJcdBrtPw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/4] ui: fix vc_chr_write call in text_console_do_init Date: Mon, 13 Jul 2020 16:10:48 +0200 Message-Id: <20200713141049.2241-4-kraxel@redhat.com> In-Reply-To: <20200713141049.2241-1-kraxel@redhat.com> References: <20200713141049.2241-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/07/13 02:19:41 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=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In case the string doesn't fit into the buffer snprintf returns the size it would need, so len can be larger than the buffer. Fix this by simply using g_strdup_printf() instead of a static buffer. Reported-by: Wenxiang Qian Signed-off-by: Gerd Hoffmann Message-id: 20200701181801.27935-1-kraxel@redhat.com --- ui/console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/console.c b/ui/console.c index 08f75c9bf624..0579be792f33 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2184,12 +2184,12 @@ static void text_console_do_init(Chardev *chr, Disp= layState *ds) text_console_resize(s); =20 if (chr->label) { - char msg[128]; - int len; + char *msg; =20 s->t_attrib.bgcol =3D QEMU_COLOR_BLUE; - len =3D snprintf(msg, sizeof(msg), "%s console\r\n", chr->label); - vc_chr_write(chr, (uint8_t *)msg, len); + msg =3D g_strdup_printf("%s console\r\n", chr->label); + vc_chr_write(chr, (uint8_t *)msg, strlen(msg)); + g_free(msg); s->t_attrib =3D s->t_attrib_default; } =20 --=20 2.18.4 From nobody Sat May 18 06:04:10 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=1594649639; cv=none; d=zohomail.com; s=zohoarc; b=NI/RWnuR4usWod0ODV28cJR08C4aFKx4omi0di72Va8MuocziBdZKJkSsTaxU3aPeyLBL3J9UZRaaMu2bzkFroKawYLuNSkqyHRvftwtBNBk62hOjrbWeJYKtStzlrWB7BfgDTrD7RDXhinz560bkHuxDCyNA7wSDPnNwjNbSKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594649639; 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=xlJIwCwQW1W3rAyO+86ewr2+LfAHR18BgiVMnndpaQo=; b=dDOp+SiHlNbWisdyRhO9ARG2S/bnj5jdt7Duh7CXbtUAvyrs1nSM5xFuSghpvipkKs5Tk0oEEJFXzWDaI/33mOBNSa0mv7B3rxPmXXfD8zz1Rihd8hyIIm5aRuK5mDLOR4c/KlBU8UA9ABUASRomdWJzME9ed9LyYIIBgo+fGWs= 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 159464963948732.496862013384316; Mon, 13 Jul 2020 07:13:59 -0700 (PDT) Received: from localhost ([::1]:58306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzDS-0001G1-7c for importer@patchew.org; Mon, 13 Jul 2020 10:13:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAb-0004bw-1L for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:01 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30180 helo=us-smtp-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 1juzAY-0006ZP-Oi for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:00 -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-208-X8gs0IhONUa5oiVYaEZ79g-1; Mon, 13 Jul 2020 10:10:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 300911009441 for ; Mon, 13 Jul 2020 14:10:54 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 095681000235; Mon, 13 Jul 2020 14:10:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3AF643F131; Mon, 13 Jul 2020 16:10:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594649456; 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=xlJIwCwQW1W3rAyO+86ewr2+LfAHR18BgiVMnndpaQo=; b=ZG38H0Sabu/f1kLGWTENIS6j4PiBZD2DQogOchFCn944am7LARIeSpbSnTDe21Mslih8VS UrWtKQUhQ8xullGRKZogbPZd+myXZjawcA9w2yJRdC4sz+clxDoIvQg9G57buNQXg9new6 1sbgXGIPRNBJvgRyxmAiBx3pVNCwI7I= X-MC-Unique: X8gs0IhONUa5oiVYaEZ79g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 4/4] usb: fix usb-host build on windows. Date: Mon, 13 Jul 2020 16:10:49 +0200 Message-Id: <20200713141049.2241-5-kraxel@redhat.com> In-Reply-To: <20200713141049.2241-1-kraxel@redhat.com> References: <20200713141049.2241-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 03:20:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, 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=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Seems the new API is not available on windows. Update #ifdefs accordingly. Fixes: 9f815e83e983 ("usb: add hostdevice property to usb-host") Reported-by: Howard Spoelstra Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Howard Spoelstra Message-id: 20200624134510.9381-1-kraxel@redhat.com --- hw/usb/host-libusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index ad7ed8fb0c67..c474551d8456 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -907,7 +907,7 @@ static int usb_host_open(USBHostDevice *s, libusb_devic= e *dev, int hostfd) goto fail; } } else { -#if LIBUSB_API_VERSION >=3D 0x01000107 +#if LIBUSB_API_VERSION >=3D 0x01000107 && !defined(CONFIG_WIN32) trace_usb_host_open_hostfd(hostfd); =20 rc =3D libusb_wrap_sys_device(ctx, hostfd, &s->dh); @@ -1107,7 +1107,7 @@ static void usb_host_realize(USBDevice *udev, Error *= *errp) QTAILQ_INIT(&s->isorings); s->hostfd =3D -1; =20 -#if LIBUSB_API_VERSION >=3D 0x01000107 +#if LIBUSB_API_VERSION >=3D 0x01000107 && !defined(CONFIG_WIN32) if (s->hostdevice) { int fd; s->needs_autoscan =3D false; --=20 2.18.4