Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp356113ybj; Thu, 19 Sep 2019 15:38:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqw0OZ8wlXuJR8fT+Wew47VRJ3gW7VzhF36n9XDfc9EEhFNhiJ+IzPgcJ2Vyqi/lk39kn+/I X-Received: by 2002:aa7:db12:: with SMTP id t18mr18770794eds.156.1568932727390; Thu, 19 Sep 2019 15:38:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568932727; cv=none; d=google.com; s=arc-20160816; b=FqUGs/2GdW8+aIWyscUFOyc+w1iov0K9hiF2uMGR3svDxDhaurEL6vu8C2wEckL6oz mz9jKhK4Hu9GPaHUEubxSREsGa5QMHIA9DX/L8xusukMUS/cz0zs/ikMssM/XEVQuWz6 fu7eDFn0BWXaf7rh0tvB+1oc7QJFGxkGlfY09YOmrMHowPrVokJyM10y4J7RJEivSHs0 icv902xP+E5mF4TpFT+Ct8hXkpV6xuExrG0oUf3gJ9/sT8vLWs7UDxQ8mCNIOtBe3gll U7pKodlVTL2brIl+SyohjKF4//Dyzgvdpr8TXtqt0F8Vcth94O82XzltI7GWqHXsN8pu 1tIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c8YSfrALmVd50cBP61A1OCzY0CAZJWmCRN6D6knKn3k=; b=a3c5TfPXHy1zeO1OBhdx8nVaJu24VsYHtbjlDxxgbwdJ/e+JvNpGiOp/DGJvAq1fPh Bc+PMddhxlV9wZCqq4AIBOtz/mWpFqqKdXXjEVcCV/kYSxFTZ18Je28MaIgizbIegZDN ohj+ostZ6r7YJy3ubZmbiP9V+Ln15yEiBukNiGV8oXY2GesUF1XX2HaE0Shd2x5RthSd nA6G4BAz77NUHEE8p9DOzKXdNGD5F9rqwW/9iexZ+8Xj/+0ejrYBRPrmDPiKu4sU2bnB jsdmEC/oLz6v9uomvuV4esXHGzqqc7paJJb5FutL7uyhXfqueXd6sgadQnZ4HMjo73NW iqaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DAvYowNt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w22si5230181eja.115.2019.09.19.15.38.24; Thu, 19 Sep 2019 15:38:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DAvYowNt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436580AbfISW3j (ORCPT + 99 others); Thu, 19 Sep 2019 18:29:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:58638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392500AbfISWR1 (ORCPT ); Thu, 19 Sep 2019 18:17:27 -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 B520121907; Thu, 19 Sep 2019 22:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931447; bh=SD+/dPytZJTVINNwhSYESFDl7e+W+IhKtgomcj9nMj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DAvYowNt1jyJokCf6eSpy39A2HUgnl+jfJEZG0opf/UjslWEusW1W2elf2ac7BqkL vq8xSYzaZ1+CROrvB05qESvnCV4eZAI62xk1bGFH5ZpopOVTHJrwyp+z7guSzJlQ1J +ZPTyg9kg5sCkxF1GsFE1tMy87dJPyPt62ibfPmM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jong Hyun Park , Tianyu Lan , Michael Kelley , Borislav Petkov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 4.14 50/59] x86/hyper-v: Fix overflow bug in fill_gva_list() Date: Fri, 20 Sep 2019 00:04:05 +0200 Message-Id: <20190919214807.701968440@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214755.852282682@linuxfoundation.org> References: <20190919214755.852282682@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Tianyu Lan [ Upstream commit 4030b4c585c41eeefec7bd20ce3d0e100a0f2e4d ] When the 'start' parameter is >= 0xFF000000 on 32-bit systems, or >= 0xFFFFFFFF'FF000000 on 64-bit systems, fill_gva_list() gets into an infinite loop. With such inputs, 'cur' overflows after adding HV_TLB_FLUSH_UNIT and always compares as less than end. Memory is filled with guest virtual addresses until the system crashes. Fix this by never incrementing 'cur' to be larger than 'end'. Reported-by: Jong Hyun Park Signed-off-by: Tianyu Lan Reviewed-by: Michael Kelley Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 2ffd9e33ce4a ("x86/hyper-v: Use hypercall for remote TLB flush") Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/hyperv/mmu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/hyperv/mmu.c b/arch/x86/hyperv/mmu.c index 56c9ebac946fe..47718fff0b797 100644 --- a/arch/x86/hyperv/mmu.c +++ b/arch/x86/hyperv/mmu.c @@ -57,12 +57,14 @@ static inline int fill_gva_list(u64 gva_list[], int offset, * Lower 12 bits encode the number of additional * pages to flush (in addition to the 'cur' page). */ - if (diff >= HV_TLB_FLUSH_UNIT) + if (diff >= HV_TLB_FLUSH_UNIT) { gva_list[gva_n] |= ~PAGE_MASK; - else if (diff) + cur += HV_TLB_FLUSH_UNIT; + } else if (diff) { gva_list[gva_n] |= (diff - 1) >> PAGE_SHIFT; + cur = end; + } - cur += HV_TLB_FLUSH_UNIT; gva_n++; } while (cur < end); -- 2.20.1