From patchwork Wed Apr 22 09:57:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227218 Return-Path: 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 85D91C5518A for ; Wed, 22 Apr 2020 10:31:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5C1C32073A for ; Wed, 22 Apr 2020 10:31:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587551490; bh=UDPBBq5m62/oTYZwB/7qxRoLYgPkifzx+8Zci/RL324=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Bs99htqAeB2K7ffD1ryHw6ZPIz/H3y3G5Z2qLwYyKmEBWIw7a5GVK/ogd+Qe8eh8q EDW0zzHqwOS6yjb8Wp6mbQfWx4c9PlXeQ1NUNx021YQRY9ES+cigEwKbH2yp9Z7Xy/ 0xcBUcMs0Z8BsI+/mu3Cm8A44lmfjFFjEd8l9ggE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730527AbgDVKb3 (ORCPT ); Wed, 22 Apr 2020 06:31:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:34918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730661AbgDVK0F (ORCPT ); Wed, 22 Apr 2020 06:26:05 -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 2E5D620781; Wed, 22 Apr 2020 10:26:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587551165; bh=UDPBBq5m62/oTYZwB/7qxRoLYgPkifzx+8Zci/RL324=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kOpawIwz/bcxIrkCZHY0eljRURVqHLHY4NfcqKY1pcuYESTWv4g9pv16K4L5cxmKp UegbBMs9AXxlx4AxJ2AUrE1cd7+qROMFD3p3FxTJIhuU+2qaa/yRh7wsXgAFmHdfwj VhXozP6e1Jh4LHTDQWoiI1hXUMUUfuAQDVc6Kf8M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jacob Pan , Lu Baolu , Joerg Roedel , Sasha Levin Subject: [PATCH 5.6 128/166] iommu/vt-d: Fix mm reference leak Date: Wed, 22 Apr 2020 11:57:35 +0200 Message-Id: <20200422095102.202329999@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095047.669225321@linuxfoundation.org> References: <20200422095047.669225321@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jacob Pan [ Upstream commit 902baf61adf6b187f0a6b789e70d788ea71ff5bc ] Move canonical address check before mmget_not_zero() to avoid mm reference leak. Fixes: 9d8c3af31607 ("iommu/vt-d: IOMMU Page Request needs to check if address is canonical.") Signed-off-by: Jacob Pan Acked-by: Lu Baolu Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/intel-svm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index d7f2a53589002..fc7d78876e021 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c @@ -611,14 +611,15 @@ static irqreturn_t prq_event_thread(int irq, void *d) * any faults on kernel addresses. */ if (!svm->mm) goto bad_req; - /* If the mm is already defunct, don't handle faults. */ - if (!mmget_not_zero(svm->mm)) - goto bad_req; /* If address is not canonical, return invalid response */ if (!is_canonical_address(address)) goto bad_req; + /* If the mm is already defunct, don't handle faults. */ + if (!mmget_not_zero(svm->mm)) + goto bad_req; + down_read(&svm->mm->mmap_sem); vma = find_extend_vma(svm->mm, address); if (!vma || address < vma->vm_start)