From patchwork Mon May 4 17:57:32 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: 226345 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 A8A5DC47257 for ; Mon, 4 May 2020 18:14:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C9F12192A for ; Mon, 4 May 2020 18:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588616067; bh=W3hrg99HdUaydIIDdtTvU7hWkGdFODXPzdfM8iQNwGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VKV3Bq0qx3aIc0+hFZYgQQ9+Ua/20iqwIzrEn/wsuUBpCTSw/+lzv1svwYL7I8mjA FAbr4Zy/97CaPseyexBsqReapeoB4Ml3leqaTT7NZvRFbP+nIbD6NMUwJt5vFl60vw 41hvthIIDyTCTjhSheP3pnxQbdBOF+Une96RkmoQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731006AbgEDSAd (ORCPT ); Mon, 4 May 2020 14:00:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:55292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730978AbgEDSAa (ORCPT ); Mon, 4 May 2020 14:00:30 -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 9983020721; Mon, 4 May 2020 18:00:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615229; bh=W3hrg99HdUaydIIDdtTvU7hWkGdFODXPzdfM8iQNwGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ELwdYho+JNhlakCp0mEztx/uNfZjptDZ7GwFgy08wvV72h7cneHhslH8zxCgc6tjQ qk0NIqcskeI2gax4feSUVukTi3XobKh07G3A74MVpeWIzopL7Dnu8z69jP5cRhlxAz qJpmkb88OrvSWKCuTlgPI7jC+vqobKESzQgDUcTs= 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.14 18/26] vfio: avoid possible overflow in vfio_iommu_type1_pin_pages Date: Mon, 4 May 2020 19:57:32 +0200 Message-Id: <20200504165446.465935417@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165442.494398840@linuxfoundation.org> References: <20200504165442.494398840@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: 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 @@ -591,7 +591,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)