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=-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 66DDCC4724C for ; Mon, 4 May 2020 18:12:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46BAF2192A for ; Mon, 4 May 2020 18:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615958; bh=2zBnnkOM1H+7bmygsb3P9WY2HQU87sUn/VQp+GBLkTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M8m7z+jSjNosDXUoWl9gLfdb9SNngDIY8bsEvyAJQoL6+QmM/eIMzT6F6IX02xi1Q BL/Q1pBMOo2Y7fvqjOMF3QW/F1kKrvAqV/o/KWHEAu3avpn3aCXYeitsN+TUtwzpex VYzpfn1rx+/3qZd1qKJM7r9dkmet6hfPIWIlyQL8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731982AbgEDSMa (ORCPT ); Mon, 4 May 2020 14:12:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:59000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731345AbgEDSCd (ORCPT ); Mon, 4 May 2020 14:02:33 -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 4ABD0206B8; Mon, 4 May 2020 18:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615352; bh=2zBnnkOM1H+7bmygsb3P9WY2HQU87sUn/VQp+GBLkTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=atJj59x7jeYaPPWcjJu9LMq9EN2EuMTJxkejTmiJ5ePzxPImS3u+XJvHnAOiMtqG8 JRK4Q75Ms5s4ZOgL1/B4esYiRP9BoUmhp6G7jM6Npof3kjX7wX+AG0h/a4mORzbxrF Zfrk7ZRe6rsn3PFLAEHO7alDU05IWJZ4JMbVmzio= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yan Zhao , Alex Williamson Subject: [PATCH 4.19 21/37] vfio: avoid possible overflow in vfio_iommu_type1_pin_pages Date: Mon, 4 May 2020 19:57:34 +0200 Message-Id: <20200504165450.604878640@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165448.264746645@linuxfoundation.org> References: <20200504165448.264746645@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: X-Mailing-List: stable@vger.kernel.org From: Yan Zhao commit 0ea971f8dcd6dee78a9a30ea70227cf305f11ff7 upstream. 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: Greg Kroah-Hartman --- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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(vo 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)