Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2476583pxb; Mon, 19 Apr 2021 06:41:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJRTiKdm0DkIMQWdHjhBb5rrdh8AmMoz2Jz6yOLIqkWoRUxgDk0kMwSZtnwgj8usH8A9ch X-Received: by 2002:a05:6402:453:: with SMTP id p19mr18627195edw.88.1618839680028; Mon, 19 Apr 2021 06:41:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618839680; cv=none; d=google.com; s=arc-20160816; b=xB2UPAsikCwbSwDcZemIrwBatuh/9a0agZDOK8B6D8k2gPP1JakML2u7Ich6ePsvQA O5BqJ8rhIuv66DXKE2YFePMP6xOMt8rGtpDYmwEh2fzadIxwVMHjB/3LPzE8/5NvKbav lsXle5sQqmVJgzN05kcp/w+XZpj0ffXn+Na1EaMAagzWNcx4bXQynFWvKjwuHKICuirx eO01r+dXzSaMOHA4+pOvAZqNxM7SxplKExm+L+CY3k5cycGH7y9Vt0pRxQt2Awuqlelg r8lVwDAPH6uPmXLV7adCirDoVQtf/FROWsTJsKv8TrFmOGv9uxOal1rPO2QwCQpdbqeH UQLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YNuTtJ5mEl6yFQc4d5hDyUc3BSvi+bplbkxOh60qu0U=; b=e9NBW5nZqjnYFCef6ThlDQjEakBQTWBUpx862a/argKyJYSg7ua0agpSlP87uzr9Rm +bYP+K+odKZUNK3GWUKwI10MwMd8PVd3miqVi79kZ3+TWDYg9frgLnQmlJiyY2+w6PVm /Bd1e48xQuOJY1s21ckNoz8FYC3XTSxt3FMVYJ6pD+V4k0xCo5uATuUeZByezT87d3z2 FC0WkmRuKpLQSLOcjWvHg34k1ce6q6T7PDLkE2hw1cYoffv4zTV4zh0gBIkam3imWsy8 O5vlVn1DkJsNBBlIDKegNGmncwAFy0ijP8nT202we8Pbt6NBnwKTAPGFFn5T1NlEk9l4 zdNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ayCDiqcc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u23si12259055ejx.579.2021.04.19.06.40.53; Mon, 19 Apr 2021 06:41:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ayCDiqcc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241852AbhDSNg5 (ORCPT + 99 others); Mon, 19 Apr 2021 09:36:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:34754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242004AbhDSNZJ (ORCPT ); Mon, 19 Apr 2021 09:25:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 52917613B2; Mon, 19 Apr 2021 13:20:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838402; bh=1afSktFHzbvLfgh7ummAMN4gyTACY4iqYSb1to7CFz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ayCDiqccn7Bk10ygln1AgmPzQNabegnckBj+VVkEpTZ9b3aXVeea2zmCqI+uBfuh0 CmfWONQ5gQJxgTfwDH6AstVOoyZeRdfNooBxtISJdQqy5h5cPG1AaulNM+8N7ppre1 itnf1MkW/NLsCYwqhBhi+z2m7fBPODsdppwdhC5I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Christian A. Ehrhardt" , David Gibson , Cornelia Huck , Alex Williamson Subject: [PATCH 5.4 47/73] vfio/pci: Add missing range check in vfio_pci_mmap Date: Mon, 19 Apr 2021 15:06:38 +0200 Message-Id: <20210419130525.353078583@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130523.802169214@linuxfoundation.org> References: <20210419130523.802169214@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian A. Ehrhardt commit 909290786ea335366e21d7f1ed5812b90f2f0a92 upstream. When mmaping an extra device region verify that the region index derived from the mmap offset is valid. Fixes: a15b1883fee1 ("vfio_pci: Allow mapping extra regions") Cc: stable@vger.kernel.org Signed-off-by: Christian A. Ehrhardt Message-Id: <20210412214124.GA241759@lisa.in-ulm.de> Reviewed-by: David Gibson Reviewed-by: Cornelia Huck Signed-off-by: Alex Williamson Signed-off-by: Greg Kroah-Hartman --- drivers/vfio/pci/vfio_pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -1474,6 +1474,8 @@ static int vfio_pci_mmap(void *device_da index = vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT); + if (index >= VFIO_PCI_NUM_REGIONS + vdev->num_regions) + return -EINVAL; if (vma->vm_end < vma->vm_start) return -EINVAL; if ((vma->vm_flags & VM_SHARED) == 0) @@ -1482,7 +1484,7 @@ static int vfio_pci_mmap(void *device_da int regnum = index - VFIO_PCI_NUM_REGIONS; struct vfio_pci_region *region = vdev->region + regnum; - if (region && region->ops && region->ops->mmap && + if (region->ops && region->ops->mmap && (region->flags & VFIO_REGION_INFO_FLAG_MMAP)) return region->ops->mmap(vdev, region, vma); return -EINVAL;