Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp2467784imd; Fri, 2 Nov 2018 11:56:09 -0700 (PDT) X-Google-Smtp-Source: AJdET5dfCGFZHa3vtnP62eHRrk7odewO2bjtdjBvhZGukRckR7m/oJ2ndCSkPNV8+/bO1fbiA8Ua X-Received: by 2002:a63:495b:: with SMTP id y27mr8832144pgk.32.1541184969488; Fri, 02 Nov 2018 11:56:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541184969; cv=none; d=google.com; s=arc-20160816; b=CUQjxyVAtP4VGlDLgoSiDFNJMtQW6BWqKDXjVE2FRDgHd41CTEYn/Xw5zltwds8gti 4qjz+7/tEZA9dZ6dNojfsrEC/7PaA/+VbCQyF77+SB5ShUCTvkeeRC2VKTb7aifmbNy4 Ua7fgIowc6d3CcoHh5Nmr6PplMOya146ZaVAeuYXmmmXfQsUaB6Ydj+XG4Ax77ZjbSvV jqBWo4mCvmMijZleHIp/2J7cVSuzVtmHz+sHZjce5GYRdrdYNbAwuj1mlwtP4Ei+qOvq pgqj5q8nZ7cBKX37JHu/8hjlc5DQhLusPVWkZsZEdRXsG3rY30jF0PTErJJD+/n9s59C fjTw== 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=zo4cs5fcjDV+hHTyrcraaYIJb33zxrlthuOrjpP2mTk=; b=sGo2BMggB7+km0tACqMz+WlkUqRO4bLMbsQ8j2ru2k7wQUpK0xeGShVEyWuB+H9DYJ Z7AnnAehlHggkrc97oDxkdrTbBPy2B1NDFpMjsiwwSjsHFXz39X2uqOclYJZYRlCYCnk 5J1hbt/CtpeePWihUlDCE3hhtnFGk1QysgSgEAbkEL2fho7xW6Z8D+jE9N4rxWt0I3Nm lvhF6goFh8CgoYK2VTvSUKFdJVoIzfXwa9sOEeAO9w/bK0Cb8bWYff+p24f27K404zln +yNCBVJ40iDaqTppt5/L3SpVNNg10Zshyap2wjfBFzsEK9aggTJSp6ZfqqTIne/jmyij jgMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nuN1NZI6; 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 y35-v6si30395659pgl.14.2018.11.02.11.55.54; Fri, 02 Nov 2018 11:56:09 -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=nuN1NZI6; 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 S1731378AbeKCEDf (ORCPT + 99 others); Sat, 3 Nov 2018 00:03:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:59510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726051AbeKCEDf (ORCPT ); Sat, 3 Nov 2018 00:03:35 -0400 Received: from localhost (5356596B.cm-6-7b.dynamic.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 D774620848; Fri, 2 Nov 2018 18:55:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541184919; bh=MvOxPeCc47LIx+psk+0tnnsXK+CTiONTDNwMT9I+i0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nuN1NZI6iKM+VZIJyl6PeR9H4dUi5W79CaY4B4JwCmOlocKFsCmPGdS9C0UkAfA/J e/yBnhpbCG0z3+rYVNzJejC5lT5B0758JIFxUmUOo9RSmdNfGGf/2lqnx4KYLuCEdI gvaKLpLMyD3zCeILpmTU/RNF/1zzkP28LZENpy9Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Michael S. Tsirkin" , Josh Poimboeuf , Andrea Arcangeli , Jason Wang , "David S. Miller" Subject: [PATCH 4.14 129/143] vhost: Fix Spectre V1 vulnerability Date: Fri, 2 Nov 2018 19:35:14 +0100 Message-Id: <20181102182908.139640940@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102182857.064326086@linuxfoundation.org> References: <20181102182857.064326086@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Wang [ Upstream commit ff002269a4ee9c769dbf9365acef633ebcbd6cbe ] The idx in vhost_vring_ioctl() was controlled by userspace, hence a potential exploitation of the Spectre variant 1 vulnerability. Fixing this by sanitizing idx before using it to index d->vqs. Cc: Michael S. Tsirkin Cc: Josh Poimboeuf Cc: Andrea Arcangeli Signed-off-by: Jason Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/vhost/vhost.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "vhost.h" @@ -1366,6 +1367,7 @@ long vhost_vring_ioctl(struct vhost_dev if (idx >= d->nvqs) return -ENOBUFS; + idx = array_index_nospec(idx, d->nvqs); vq = d->vqs[idx]; mutex_lock(&vq->mutex);