From nobody Thu May 16 08:13:18 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=1591188625; cv=none; d=zohomail.com; s=zohoarc; b=H2+cYMwzTe7gxJn6BEcJFT+QY0pl4Ig6N2n6TKTSH0ocHNKQGDrQllGVWqaP9bTHjs3+1LYgj/uH8+Bie9ja6+DzKFWhiktUl9zsUQsqtTzg684Kvh8T/DgL69sfL2hDvzDuiXCdSEjN0zb22MGP4aduu/JgI1BxB3LoYoy8O+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591188625; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=5EGQLuICNFeRjd9HJONtfAD5ly5gPefyS6jbVQcj0Ao=; b=LdNSJCP7rVO9rnUJ6ANP9HbMdcbk/8lU4ofIiNY0cKD4a24o+k5GURPqCix2BY/9DXK+nXT2pxOdeFM4uTu/tp5QfMbPwCdkpof63hWo/4oVkhMqxDzVn65iysi0i2a1FTzxivMvmd3JPwFTFtXKQyyHo7PP+hyUbu6Qmr3Az/w= 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 1591188625583173.22824253692954; Wed, 3 Jun 2020 05:50:25 -0700 (PDT) Received: from localhost ([::1]:55484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgSqd-00083s-IE for importer@patchew.org; Wed, 03 Jun 2020 08:50:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgSq3-0007c3-Nq for qemu-devel@nongnu.org; Wed, 03 Jun 2020 08:49:47 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:26540 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 1jgSq2-0000YM-T4 for qemu-devel@nongnu.org; Wed, 03 Jun 2020 08:49:47 -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-109-p9hXp0puPC6A-xQpsBlGQg-1; Wed, 03 Jun 2020 08:49:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4478E18A8225; Wed, 3 Jun 2020 12:49:42 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.8.119]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 012A25D9D3; Wed, 3 Jun 2020 12:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591188585; 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=5EGQLuICNFeRjd9HJONtfAD5ly5gPefyS6jbVQcj0Ao=; b=Gkpw0brt9/NTK8dGpvwMPAQ13HNwALUdFh9oMbksJp0VQIpelN2RXvOQVHD2yxVIuCknMO eNfgrJAn8aApy1J2IkzFqU8fSOc0q89RSdAnHph9uv/HCcaHuGEMYUoaHlW0cMSWlDkZcx NNTY/900Mx5ylhdhp867yZ1e5nG3h+U= X-MC-Unique: p9hXp0puPC6A-xQpsBlGQg-1 From: P J P To: Gerd Hoffmann Subject: [PATCH] ati-vga: increment mm_index in ati_mm_read/write Date: Wed, 3 Jun 2020 18:17:32 +0530 Message-Id: <20200603124732.1137892-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=207.211.31.81; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/03 01:12:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Prasad J Pandit , Yi Ren , QEMU Developers , Ren Ding , Hanqing Zhao Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit While accessing VGA registers via ati_mm_read/write routines, a guest may set 's->regs.mm_index' such that it leads to infinite recursion. Increment the mm_index value to avoid it. Reported-by: Ren Ding Reported-by: Hanqing Zhao Reported-by: Yi Ren Signed-off-by: Prasad J Pandit --- hw/display/ati.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 065f197678..fa9061ad0b 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -286,7 +286,8 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr, = unsigned int size) val =3D ldn_le_p(s->vga.vram_ptr + idx, size); } } else { - val =3D ati_mm_read(s, s->regs.mm_index + addr - MM_DATA, size= ); + uint32_t idx =3D s->regs.mm_index++; + val =3D ati_mm_read(s, idx + addr - MM_DATA, size); } break; case BIOS_0_SCRATCH ... BUS_CNTL - 1: @@ -521,7 +522,8 @@ static void ati_mm_write(void *opaque, hwaddr addr, stn_le_p(s->vga.vram_ptr + idx, size, data); } } else { - ati_mm_write(s, s->regs.mm_index + addr - MM_DATA, data, size); + uint32_t idx =3D s->regs.mm_index++; + ati_mm_write(s, idx + addr - MM_DATA, data, size); } break; case BIOS_0_SCRATCH ... BUS_CNTL - 1: --=20 2.26.2