From mboxrd@z Thu Jan 1 00:00:00 1970 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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 D0F8BC4360F for ; Tue, 12 Mar 2019 18:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 894F42087C for ; Tue, 12 Mar 2019 18:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552414235; bh=On3Sm1z02ADxIsJDmKYBvyQUP4OjGqy2DkpD6fxol44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FRAJPO1y/s1sqjIlVXj9ASC/TwnUPwXuyBxHEP5+dH+uiBFsUgV5QF7zYl/pspE5B u95nwV7mPHMWw9IRE9NXM5/ANrDalQI0XCMG/8j8U4or1bM8g32+djeVvCoc70logU 7H2RhEzy97jtopHBk4RLZKidV2WErYUWPgZxdI2Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727180AbfCLRLw (ORCPT ); Tue, 12 Mar 2019 13:11:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:45544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727080AbfCLRLn (ORCPT ); Tue, 12 Mar 2019 13:11:43 -0400 Received: from localhost (unknown [104.133.8.98]) (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 72265217D8; Tue, 12 Mar 2019 17:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410702; bh=On3Sm1z02ADxIsJDmKYBvyQUP4OjGqy2DkpD6fxol44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LiAwBDi2GFD6hV/911fXxaEXBXoI0uYSF7QSeez49O9Ghn29aUoGF1XqSCJOX0Xaw sugRdLMdwtlPYw3ZT4Pc+j9I7OaDOqm3t9dwq+yGRTWUvYNdPqyZRRZrxav1jQPhEG IBkZpSXe8L4txvcUtaUojqrih+Ij43E6Kct03hts= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joerg Roedel , Suravee Suthikulpanit , Jerry Snitselaar , Joerg Roedel , Sasha Levin Subject: [PATCH 4.20 013/171] iommu/amd: Call free_iova_fast with pfn in map_sg Date: Tue, 12 Mar 2019 10:06:33 -0700 Message-Id: <20190312170349.038441327@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 51d8838d66d3249508940d8f59b07701f2129723 ] In the error path of map_sg, free_iova_fast is being called with address instead of the pfn. This results in a bad value getting into the rcache, and can result in hitting a BUG_ON when iova_magazine_free_pfns is called. Cc: Joerg Roedel Cc: Suravee Suthikulpanit Signed-off-by: Jerry Snitselaar Fixes: 80187fd39dcb ("iommu/amd: Optimize map_sg and unmap_sg") Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 325f3bad118b..5f33f843d30a 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2561,7 +2561,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, } out_free_iova: - free_iova_fast(&dma_dom->iovad, address, npages); + free_iova_fast(&dma_dom->iovad, address >> PAGE_SHIFT, npages); out_err: return 0; -- 2.19.1