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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 5F9D9C38A2A for ; Thu, 7 May 2020 14:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3043F2073A for ; Thu, 7 May 2020 14:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861765; bh=DPE8s2oC1JMVuEkSyn2rkj3IAwdAdBt9u5pz3lRE9H0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Wm/X0M66MUxZUIYJdV73phQK7yfjlTRZFQpzCBcLtIsNsM3CnDivtlEMroe+KfOZc hW5DVcjLhE2PpMz+erbbxyVN+G/ac7onY8EpQ6W5bxz86iksFpRPCcpD/J3g/6Ni3S G2OAL47gmxs6s1fzGCDBVtDHr2xJlVFt2zF0dPZ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728474AbgEGO3W (ORCPT ); Thu, 7 May 2020 10:29:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:56970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728515AbgEGO3W (ORCPT ); Thu, 7 May 2020 10:29:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E58EF2083B; Thu, 7 May 2020 14:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861761; bh=DPE8s2oC1JMVuEkSyn2rkj3IAwdAdBt9u5pz3lRE9H0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oA7gIpzUi8r7+b4dXU3AoiEsb2cCBe6WAov+Tk8ArCE2ydiTH3NJKgnvQCh+ozwsg FH3nsNAHLmb6lkMpm6E822VD6Ks2QayJsxOAJQ8SGA6clmVKW+4RCB4GK4aTe2Vbii WDqOUry13SkzqQ4YMgeH7jKS78MAf5IdJ9FET7Ow= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yan Zhao , Alex Williamson , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 03/20] vfio: avoid possible overflow in vfio_iommu_type1_pin_pages Date: Thu, 7 May 2020 10:28:59 -0400 Message-Id: <20200507142917.26612-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200507142917.26612-1-sashal@kernel.org> References: <20200507142917.26612-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yan Zhao [ Upstream commit 0ea971f8dcd6dee78a9a30ea70227cf305f11ff7 ] add parentheses to avoid possible vaddr overflow. Fixes: a54eb55045ae ("vfio iommu type1: Add support for mediated devices") Signed-off-by: Yan Zhao Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index c362757540866..c635ba3167f7b 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -598,7 +598,7 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data, continue; } - remote_vaddr = dma->vaddr + iova - dma->iova; + remote_vaddr = dma->vaddr + (iova - dma->iova); ret = vfio_pin_page_external(dma, remote_vaddr, &phys_pfn[i], do_accounting); if (ret) -- 2.20.1