Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391AbbKJN1i (ORCPT ); Tue, 10 Nov 2015 08:27:38 -0500 Received: from 8bytes.org ([81.169.241.247]:35413 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753334AbbKJN1R (ORCPT ); Tue, 10 Nov 2015 08:27:17 -0500 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: Oded Gabbay , David Woodhouse , Linus Torvalds , linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 1/4] iommu/amd: Do proper access checking before calling handle_mm_fault() Date: Tue, 10 Nov 2015 14:26:43 +0100 Message-Id: <1447162006-20672-2-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447162006-20672-1-git-send-email-joro@8bytes.org> References: <1447162006-20672-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1816 Lines: 59 From: Joerg Roedel The handle_mm_fault function expects the caller to do the access checks. Not doing so and calling the function with wrong permissions is a bug (catched by a BUG_ON). So fix this bug by adding proper access checking to the io page-fault code in the AMD IOMMUv2 driver. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu_v2.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index d21d4ed..612f7c8 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c @@ -494,6 +494,22 @@ static void handle_fault_error(struct fault *fault) } } +static bool access_error(struct vm_area_struct *vma, struct fault *fault) +{ + unsigned int allowed = 0; + + if (fault->flags & PPR_FAULT_EXEC) + allowed = vma->vm_flags & VM_EXEC; + + if (fault->flags & PPR_FAULT_READ) + allowed = vma->vm_flags & VM_READ; + + if (fault->flags & PPR_FAULT_WRITE) + allowed = vma->vm_flags & VM_WRITE; + + return allowed ? false : true; +} + static void do_fault(struct work_struct *work) { struct fault *fault = container_of(work, struct fault, work); @@ -516,8 +532,8 @@ static void do_fault(struct work_struct *work) goto out; } - if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))) { - /* handle_mm_fault would BUG_ON() */ + /* Check if we have the right permissions on the vma */ + if (access_error(vma, fault)) { up_read(&mm->mmap_sem); handle_fault_error(fault); goto out; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/