From nobody Thu May 16 06:01:28 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=1591216104; cv=none; d=zohomail.com; s=zohoarc; b=Q3VywTNLr53DoWPMfO69vQgleDu6tOEasZ/0LeI5ryBEdHtD3cueLcpPzPcnhWOTPC6339Ecr+MU5SysRhiuCZzvuCANGO+/6BF8ug6b6sYcFVEN+uEHFkvzuCs1j1vXEmwUqiDRmYQ631GS0dJLksNqcWBXhR+8KgPA4uoY9LU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591216104; 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=JCgG8ISubrM+kJIfJPC1zMNcLWZ+ZYJCZY8lISrvEqE=; b=O+oK6IPNGddw7AZJwMUEXlMoNn0TUlcZGklbdMH6yZMimszaJe7krkiMeCnKlcLEghiz+KjBE7iHiVObgXXSr2xkSnGawU/lD+IHMLzTsl4LDgvKW5z/20ec6Jm31ovJa1Yfdby11dBOAZbBJLw6F7LSVqe7ir1MhrFKuwXvZHs= 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 1591216104104176.95612432966038; Wed, 3 Jun 2020 13:28:24 -0700 (PDT) Received: from localhost ([::1]:54154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgZzq-0008CJ-3P for importer@patchew.org; Wed, 03 Jun 2020 16:28:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgZwv-0004S2-AM for qemu-devel@nongnu.org; Wed, 03 Jun 2020 16:25:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53252 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 1jgZwt-0000oo-S9 for qemu-devel@nongnu.org; Wed, 03 Jun 2020 16:25:21 -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-173-pVUvss3MMKi0Jk4BvytXXw-1; Wed, 03 Jun 2020 16:25:15 -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 C241864ACA; Wed, 3 Jun 2020 20:25:13 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.8.119]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33B265C3E7; Wed, 3 Jun 2020 20:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591215919; 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=JCgG8ISubrM+kJIfJPC1zMNcLWZ+ZYJCZY8lISrvEqE=; b=Zh2Kvi6APC3bTaUvvECvmVbUArOoFTHfMPs0aSFndAIimh+HDbiTdf0bViCgmfMDYCJSSc MI21pYTxWkiNacDZ3IaOUtFwvcjkIM41A1bMIHTxZX90Rw5Z3qtWSBwMI3BKHSK4Ntk/lQ 6b5snypHzN6naiC/fKKSU85I6S4766E= X-MC-Unique: pVUvss3MMKi0Jk4BvytXXw-1 From: P J P To: Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/2] ait-vga: check address before reading configuration bytes Date: Thu, 4 Jun 2020 01:52:50 +0530 Message-Id: <20200603202251.1199170-2-ppandit@redhat.com> In-Reply-To: <20200603202251.1199170-1-ppandit@redhat.com> References: <20200603202251.1199170-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.120; envelope-from=ppandit@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/03 15:26:56 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_H3=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: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Prasad J Pandit , "Michael S . Tsirkin" , 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 reading PCI configuration bytes, a guest may send an address towards the end of the configuration space. It may lead to an OOB access issue. Add check to ensure 'address + size' is within PCI configuration space. Reported-by: Ren Ding Reported-by: Hanqing Zhao Reported-by: Yi Ren Signed-off-by: Prasad J Pandit --- hw/display/ati.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Update v2: add check to avoid OOB PCI configuration space access -> https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg00711.html diff --git a/hw/display/ati.c b/hw/display/ati.c index bda4a2d816..6671959e5d 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -384,7 +384,10 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr,= unsigned int size) val =3D s->regs.crtc_pitch; break; case 0xf00 ... 0xfff: - val =3D pci_default_read_config(&s->dev, addr - 0xf00, size); + addr =3D addr - 0xf00; + if (addr + size <=3D 0xff) { + val =3D pci_default_read_config(&s->dev, addr, size); + } break; case CUR_OFFSET: val =3D s->regs.cur_offset; --=20 2.26.2 From nobody Thu May 16 06:01:28 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=1591216005; cv=none; d=zohomail.com; s=zohoarc; b=l2iSEn7TDq4ItfK7xTHL1b2tnm1qgpFa+60oJrkIMjys2aaBNZi+5mKKIZQdTDNC9v7TqDFbA/NBn4oO3MSopJgc3VjtXLpCEK+ambNfwA4kCn4QjSFZLu6GB2785wwUWqSrhkAntAhVBpu/yNTqBGR5LC0fU79YT3uccL7bzSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591216005; 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=iL+BFziTjgxkTLHJcTsnhCxr1fg4pJ4mFQ4EP9xvyzk=; b=boLTK3NqdAJTTmPo5U5pThXR0QPU2AWqh8lbwkbyX0LlFbS8Mr1E3LMzfRRiUb+AvBz55wnwRDsuuUO7RJlWn79U0cdte+k0QJYMU9nRjk9gti0TOKlS0a5w3thXM/XQxkb5F01aLmFBgpw7YCs4DoNXQZB0E4O4k6R3a2KTiqs= 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 1591216005301551.1786306322831; Wed, 3 Jun 2020 13:26:45 -0700 (PDT) Received: from localhost ([::1]:48618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgZyG-0005fY-3v for importer@patchew.org; Wed, 03 Jun 2020 16:26:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgZx4-0004dt-F0 for qemu-devel@nongnu.org; Wed, 03 Jun 2020 16:25:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20701 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 1jgZx3-0000qI-G6 for qemu-devel@nongnu.org; Wed, 03 Jun 2020 16:25:30 -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-468-0X2t5JdaOByNjsCFvJKwvQ-1; Wed, 03 Jun 2020 16:25:25 -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 C29B9800685; Wed, 3 Jun 2020 20:25:24 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.8.119]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 12B675C3E7; Wed, 3 Jun 2020 20:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591215928; 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=iL+BFziTjgxkTLHJcTsnhCxr1fg4pJ4mFQ4EP9xvyzk=; b=HXThjarU1qeteNcuWBQPY6auT4CdDNfIqYWsnzoiC9elkslJ9Ut4VPU0uOEMNJ6pM9KZdx J/oMUEHE2/K6rmiIFUyrEFXb+QQCSxRMPqE3FbwBeeRic0pIgVjRMOKUWvTDRWWOByVbDI I3PfhOq0qFmK/TGgjbm2uBhMH41g9JM= X-MC-Unique: 0X2t5JdaOByNjsCFvJKwvQ-1 From: P J P To: Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] pci: ensure configuration access is within bounds Date: Thu, 4 Jun 2020 01:52:51 +0530 Message-Id: <20200603202251.1199170-3-ppandit@redhat.com> In-Reply-To: <20200603202251.1199170-1-ppandit@redhat.com> References: <20200603202251.1199170-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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=ppandit@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/03 01:04:35 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: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Prasad J Pandit , "Michael S . Tsirkin" , 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) From: Prasad J Pandit While reading PCI configuration bytes, a guest may send an address towards the end of the configuration space. It may lead to an OOB access issue. Assert that 'address + len' is within PCI configuration space. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Prasad J Pandit --- hw/pci/pci.c | 2 ++ 1 file changed, 2 insertions(+) Update v2: assert PCI configuration access is within bounds -> https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg00711.html diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 70c66965f5..173bec4fd5 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1381,6 +1381,8 @@ uint32_t pci_default_read_config(PCIDevice *d, { uint32_t val =3D 0; =20 + assert(address + len <=3D pci_config_size(d)); + if (pci_is_express_downstream_port(d) && ranges_overlap(address, len, d->exp.exp_cap + PCI_EXP_LNKSTA, 2)) { pcie_sync_bridge_lnk(d); --=20 2.26.2