From nobody Sun May 5 21:53:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16237789886641010.1133525947181; Tue, 15 Jun 2021 10:43:08 -0700 (PDT) Received: from localhost ([::1]:36494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltD5f-00022r-N6 for importer2@patchew.org; Tue, 15 Jun 2021 13:43:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltD3R-000853-G1 for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:40:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltD3P-0003OP-Oe for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:40:49 -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-101-fzuU1I_oPNWfP4eJouONWQ-1; Tue, 15 Jun 2021 13:40:42 -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 19A5F1937FC1; Tue, 15 Jun 2021 17:40:41 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2EB460853; Tue, 15 Jun 2021 17:40:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DAC4618003AA; Tue, 15 Jun 2021 19:40:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778843; 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=EHyfWTD77Q9mqWshdelwCncF365bW5DaK4djyvfG97k=; b=VbtFfgZZxCGkvfD5RQ7gWXR3K5bSkZOOeFbZScWgMx/Aw24rJbGuLwvZ4ztdshpHeurRXs t08zG/i/Y7PbjrFo9OYXLXc40MfYlWnObI5kof9dyOa5bTISYPjcU+vFfs3F489RRIUu1x oxrovKbkAKBe4/PlpaabSFQU/uHz+VM= X-MC-Unique: fzuU1I_oPNWfP4eJouONWQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/3] vga: Allow writing VBE_DISPI_ID5 to ID register Date: Tue, 15 Jun 2021 19:40:23 +0200 Message-Id: <20210615174025.3409518-2-kraxel@redhat.com> In-Reply-To: <20210615174025.3409518-1-kraxel@redhat.com> References: <20210615174025.3409518-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+importer2=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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Dennis=20W=C3=B6lfing?= , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Dennis W=C3=B6lfing The highest VBE_DISPI_INDEX_ID version supported by QEMU is VBE_DISPI_ID5. But currently QEMU only allows writing values up to VBE_DISPI_ID4 to the VBE_DISPI_INDEX_ID register. As a result of this when a lower version is written to this register and later VBE_DISPI_ID5 is written back, reads from the register will continue to report the lower version. Indeed SeaBIOS is doing that during VGA initialization which causes guests to always read VBE_DISPI_ID0 instead of the correct version. Signed-off-by: Dennis W=C3=B6lfing Message-Id: <20210607115303.228659-1-denniswoelfing@gmx.de> Signed-off-by: Gerd Hoffmann --- hw/display/vga.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index 28a90e30d0cf..9d1f66af402e 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -752,7 +752,8 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr,= uint32_t val) val =3D=3D VBE_DISPI_ID1 || val =3D=3D VBE_DISPI_ID2 || val =3D=3D VBE_DISPI_ID3 || - val =3D=3D VBE_DISPI_ID4) { + val =3D=3D VBE_DISPI_ID4 || + val =3D=3D VBE_DISPI_ID5) { s->vbe_regs[s->vbe_index] =3D val; } break; --=20 2.31.1 From nobody Sun May 5 21:53:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162377926313477.33596646650085; Tue, 15 Jun 2021 10:47:43 -0700 (PDT) Received: from localhost ([::1]:47184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltDA6-00019I-4e for importer2@patchew.org; Tue, 15 Jun 2021 13:47:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltD3f-00008N-91 for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:41:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltD3Z-0003XH-PM for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:41: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-499-5mV3HLlUN5iXMNmS8vxSRw-1; Tue, 15 Jun 2021 13:40:55 -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 77DEE1084F4A; Tue, 15 Jun 2021 17:40:54 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 287CB1962D; Tue, 15 Jun 2021 17:40:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E5FBB18003B6; Tue, 15 Jun 2021 19:40:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778857; 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=ixzbqTGrnkDdaDRNlYbW9vE+R1y9kfRoe1BEyGd7dwI=; b=SWk9sZnUoiBzYNmnZ2GrIygk4bIKyBfW62Yoip1iqxn1fDSM8pVWkscz5Ak17YzV9Dluy9 CQNNX+KV0Jux0stKIySrFsAOeV7e9oEJtKvMe1cFXYbq/2SgGhCrq4yuBwXT+e5Ug2UMiC 9N5Ws8+NnYwZSpl5qvbvOn28fUa4X7c= X-MC-Unique: 5mV3HLlUN5iXMNmS8vxSRw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/3] vhost-user-gpu: reorder free calls. Date: Tue, 15 Jun 2021 19:40:24 +0200 Message-Id: <20210615174025.3409518-3-kraxel@redhat.com> In-Reply-To: <20210615174025.3409518-1-kraxel@redhat.com> References: <20210615174025.3409518-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+importer2=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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Qiang , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Free in correct order to avoid use-after-free. Resolves: CID 1453812 Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210604103714.1237414-1-kraxel@redhat.com> --- contrib/vhost-user-gpu/vhost-user-gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-g= pu/vhost-user-gpu.c index 6dc6a44f4e26..611360e6b475 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -350,8 +350,8 @@ vg_resource_create_2d(VuGpu *g, if (!res->image) { g_critical("%s: resource creation failed %d %d %d", __func__, c2d.resource_id, c2d.width, c2d.height); - g_free(res); vugbm_buffer_destroy(&res->buffer); + g_free(res); cmd->error =3D VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY; return; } --=20 2.31.1 From nobody Sun May 5 21:53:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16237793587861021.4267456498038; Tue, 15 Jun 2021 10:49:18 -0700 (PDT) Received: from localhost ([::1]:51648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltDBd-0004BA-QY for importer2@patchew.org; Tue, 15 Jun 2021 13:49:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltD3h-0000Ch-6s for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:41:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltD3e-0003ZG-Ln for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:41:04 -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-353-i5h_1kiuNCq9YkfOZ_O_TQ-1; Tue, 15 Jun 2021 13:40:59 -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 77B70100B3AB; Tue, 15 Jun 2021 17:40:57 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99C4B5C22A; Tue, 15 Jun 2021 17:40:47 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F1361180060E; Tue, 15 Jun 2021 19:40:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778860; 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=iV4BAQ+klh6qramPeT9npbbKerAjx5rq2qDIbQIR4U8=; b=bWRE+SLDatnzpg2pXq6qRricV2BMWndqk4q8TWyqzQWF/MSOqs1sM2KJRSTcKozY1mNNfO nYfx/mX+OGXx+U3cRY1WJHVZsQmJsg+q8o2gKKIFNd+4B+10MO/Ah860AWvIJJG+2YjTjz 0e1k6h+lsZIvkEYnIy9Fyv5etGBjEMo= X-MC-Unique: i5h_1kiuNCq9YkfOZ_O_TQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/3] virtio-gpu: move scanout_id sanity check Date: Tue, 15 Jun 2021 19:40:25 +0200 Message-Id: <20210615174025.3409518-4-kraxel@redhat.com> In-Reply-To: <20210615174025.3409518-1-kraxel@redhat.com> References: <20210615174025.3409518-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-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+importer2=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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, 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: "Michael S. Tsirkin" , Li Qiang , Vivek Kasireddy , Alexander Bulekov , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Checking scanout_id in virtio_gpu_do_set_scanout() is too late, for the "resource_id =3D=3D 0" case (aka disable scanout) the scanout_id is used unchecked. Move the check into the callers to fix that. Fixes: e64d4b6a9bc3 ("virtio-gpu: Refactor virtio_gpu_set_scanout") Fixes: 32db3c63ae11 ("virtio-gpu: Add virtio_gpu_set_scanout_blob") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/383 Reported-by: Alexander Bulekov Signed-off-by: Gerd Hoffmann Reviewed-by: Vivek Kasireddy Reviewed-by: Li Qiang Message-Id: <20210604075029.1201478-1-kraxel@redhat.com> --- hw/display/virtio-gpu.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 4d549377cbc1..e183f4ecdaa5 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -610,12 +610,6 @@ static void virtio_gpu_do_set_scanout(VirtIOGPU *g, struct virtio_gpu_scanout *scanout; uint8_t *data; =20 - if (scanout_id >=3D g->parent_obj.conf.max_outputs) { - qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id specified %= d", - __func__, scanout_id); - *error =3D VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; - return; - } scanout =3D &g->parent_obj.scanout[scanout_id]; =20 if (r->x > fb->width || @@ -694,6 +688,13 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g, trace_virtio_gpu_cmd_set_scanout(ss.scanout_id, ss.resource_id, ss.r.width, ss.r.height, ss.r.x, ss.r= .y); =20 + if (ss.scanout_id >=3D g->parent_obj.conf.max_outputs) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id specified %= d", + __func__, ss.scanout_id); + cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; + return; + } + if (ss.resource_id =3D=3D 0) { virtio_gpu_disable_scanout(g, ss.scanout_id); return; @@ -730,6 +731,13 @@ static void virtio_gpu_set_scanout_blob(VirtIOGPU *g, ss.r.width, ss.r.height, ss.r.x, ss.r.y); =20 + if (ss.scanout_id >=3D g->parent_obj.conf.max_outputs) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id specified %= d", + __func__, ss.scanout_id); + cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; + return; + } + if (ss.resource_id =3D=3D 0) { virtio_gpu_disable_scanout(g, ss.scanout_id); return; --=20 2.31.1