Message ID | 20200504165500.249563044@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=p9ou=6S=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9095C3A5A9 for <stable@archiver.kernel.org>; Mon, 4 May 2020 18:11:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB68920663 for <stable@archiver.kernel.org>; Mon, 4 May 2020 18:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615886; bh=ukpQ4s0+WzDkKUC3hFMKcXDyUyxTWKPp2c9PxTIZwYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xBQspE4If5TAZU9BCHkbrQwviGjy0mJ04XDx8zUjQNN/tw39+tWQeN0SPZZosGmhM Mz58Ez/FvuoL1sotVKu0EKcc0jf57KJezi4Hz5ln0sDjPbn0uoCxwOHM6Xw+twkNn1 2K6/IgLsxNa8DJEfitEJpJAmK8GbXEHWB9ow/q8Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731322AbgEDSLU (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 4 May 2020 14:11:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:33578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731642AbgEDSEN (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 4 May 2020 14:04:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BEC76206B8; Mon, 4 May 2020 18:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615452; bh=ukpQ4s0+WzDkKUC3hFMKcXDyUyxTWKPp2c9PxTIZwYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=10jVVIeTD56akwh9YkfkGoLe9HiUhZ8bD53jIuylnYduZiUn0F4TwRGAG8NazZOGX J/Tj+8we/45xMUoxo1jSWYUgt1+4xDkMlsyeun2EwFx4Pl3E1RGptiVt6vYQvVeabg qKRF/my34r/Q1pIed9M/0499N38yiX04iAznYLpQ= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Sean Christopherson <sean.j.christopherson@intel.com>, Alex Williamson <alex.williamson@redhat.com> Subject: [PATCH 5.4 45/57] vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn() Date: Mon, 4 May 2020 19:57:49 +0200 Message-Id: <20200504165500.249563044@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165456.783676004@linuxfoundation.org> References: <20200504165456.783676004@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -380,8 +380,8 @@ static int vaddr_get_pfn(struct mm_struc vma = find_vma_intersection(mm, vaddr, vaddr + 1); if (vma && vma->vm_flags & VM_PFNMAP) { - *pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; - if (is_invalid_reserved_pfn(*pfn)) + if (!follow_pfn(vma, vaddr, pfn) && + is_invalid_reserved_pfn(*pfn)) ret = 0; }