From patchwork Wed Jun 3 12:40:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11585637 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C861913 for ; Wed, 3 Jun 2020 12:43:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 625E020678 for ; Wed, 3 Jun 2020 12:43:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WuI8eVwH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 625E020678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:45962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgSjr-0003Gq-Mk for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Jun 2020 08:43:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgSjR-0002q9-NK for qemu-devel@nongnu.org; Wed, 03 Jun 2020 08:42:57 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:48229 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 1jgSjP-0007J9-U4 for qemu-devel@nongnu.org; Wed, 03 Jun 2020 08:42:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591188174; 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=nH15nRUs00Ze2dTLkPXBQ8fi6RmKfZ38xVpf0WYT+2o=; b=WuI8eVwHA58NuWSbMNTxQkqR5OWmsH1AL90hEPIg9i5ZhGRYuDShfhAOrNeYzMQZrN70ys oALtfay7NYD5LDwt4P2MhIeobKzQjsYby74LfgIR7rG4J6VWJ0N8SMJveKjA60ZWlzE0Ad VtA5CHwxr//qFiDj2ng8ttZVTZmvL7M= 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-453-RJj7PU-5OWyNeKHOlzTf5w-1; Wed, 03 Jun 2020 08:42:51 -0400 X-MC-Unique: RJj7PU-5OWyNeKHOlzTf5w-1 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 897B0100A8EF; Wed, 3 Jun 2020 12:42:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.8.119]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D63E78EFF; Wed, 3 Jun 2020 12:42:44 +0000 (UTC) From: P J P To: "Michael S . Tsirkin" Subject: [PATCH] pci: check address before reading configuration bytes Date: Wed, 3 Jun 2020 18:10:41 +0530 Message-Id: <20200603124041.1137464-1-ppandit@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 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 + len' is within PCI configuration space. Reported-by: Ren Ding Reported-by: Hanqing Zhao Reported-by: Yi Ren Signed-off-by: Prasad J Pandit --- hw/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 70c66965f5..4429fa9401 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1385,7 +1385,9 @@ uint32_t pci_default_read_config(PCIDevice *d, ranges_overlap(address, len, d->exp.exp_cap + PCI_EXP_LNKSTA, 2)) { pcie_sync_bridge_lnk(d); } - memcpy(&val, d->config + address, len); + if (address + len <= pci_config_size(d)) { + memcpy(&val, d->config + address, len); + } return le32_to_cpu(val); }