From nobody Sun May 19 13:14:40 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=1603276886; cv=none; d=zohomail.com; s=zohoarc; b=NODH+vEZ8q+iSnqVZm8CH5zw6vuLVlr89TTK9hruUXSG71fbRlSfMkmYZOGuySYK4bSZ16lHhxMDaNT0MJBnubZkvRFsHeoWg3+xSoFvTloCCfOIujdh5ZRhHMqHgi2gor+Jywbv/2wgDDSi03jtN7Y96zTFMSICXwg9vy9o3K8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603276886; 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=5ywdHMngM8fAhFHKpQAdFGy8Vffg0ktwnuGgEhnS9SY=; b=FDs9OP3CTmdRsX9b1LX+kR1XdBi2gLrTP9B9fKttthjLbBLP2O4ADr6ENH51FUGHtKA52IkWhdYH+x26ZCDES3ag4qpGOJqEwAijkjGm/lA2v0Ga7H6qKCpmpLAvly6oxLBiLMvi/WBj6nYfrU6JEoqDleDd6NngMOXt4gZ2Z3A= 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 160327688671897.58050285611682; Wed, 21 Oct 2020 03:41:26 -0700 (PDT) Received: from localhost ([::1]:40016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVBYb-0008MR-I6 for importer@patchew.org; Wed, 21 Oct 2020 06:41:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVBXp-0007vD-GP for qemu-devel@nongnu.org; Wed, 21 Oct 2020 06:40:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVBXm-0007uG-KM for qemu-devel@nongnu.org; Wed, 21 Oct 2020 06:40:36 -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-537-jlXLl6VzPWiC5ZIpIUdM6g-1; Wed, 21 Oct 2020 06:40:29 -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 3E3A31074662; Wed, 21 Oct 2020 10:40:28 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.95]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83F3310013D0; Wed, 21 Oct 2020 10:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603276832; 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=5ywdHMngM8fAhFHKpQAdFGy8Vffg0ktwnuGgEhnS9SY=; b=MG6z66b5FFaPEl8f8HTvNjj6blQHMM5gYKZvxj4OOG3ql4tUJZ1DZxzdHLnbCyZ3qVbIQo /34mVyb6AP58HGAG/tuRzO3BEtrBp/DMGzv6lhEUwJOJVlbjnJDCXlE/aLgqXLPr6tcCcT pi1P2pt65dkN8pv/Po6EcGTufC0Pnjk= X-MC-Unique: jlXLl6VzPWiC5ZIpIUdM6g-1 From: P J P To: BALATON Zoltan Subject: [PATCH v2] ati: check x y display parameter values Date: Wed, 21 Oct 2020 16:08:18 +0530 Message-Id: <20201021103818.1704030-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ppandit@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=ppandit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/21 02:16:02 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_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: Prasad J Pandit , Gaoning Pan , Gerd Hoffmann , QEMU Developers 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 The source and destination x,y display parameters in ati_2d_blt() may run off the vga limits if either of s->regs.[src|dst]_[xy] is zero. Check the parameter values to avoid potential crash. Reported-by: Gaoning Pan Signed-off-by: Prasad J Pandit --- hw/display/ati_2d.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Update v2: add [dst|src]_[xy] > 0x3fff check -> https://lists.nongnu.org/archive/html/qemu-devel/2020-10/msg05698.html diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index 23a8ae0cd8..4dc10ea795 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -75,8 +75,9 @@ void ati_2d_blt(ATIVGAState *s) dst_stride *=3D bpp; } uint8_t *end =3D s->vga.vram_ptr + s->vga.vram_size; - if (dst_bits >=3D end || dst_bits + dst_x + (dst_y + s->regs.dst_heigh= t) * - dst_stride >=3D end) { + if (dst_x > 0x3fff || dst_y > 0x3fff || dst_bits >=3D end + || dst_bits + dst_x + + (dst_y + s->regs.dst_height) * dst_stride >=3D end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } @@ -107,8 +108,9 @@ void ati_2d_blt(ATIVGAState *s) src_bits +=3D s->regs.crtc_offset & 0x07ffffff; src_stride *=3D bpp; } - if (src_bits >=3D end || src_bits + src_x + - (src_y + s->regs.dst_height) * src_stride >=3D end) { + if (src_x > 0x3fff || src_y > 0x3fff || src_bits >=3D end + || src_bits + src_x + + (src_y + s->regs.dst_height) * src_stride >=3D end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } -- 2.26.2