From patchwork Thu Feb 13 15:19:52 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: 231273 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,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 EDC41C2BA83 for ; Thu, 13 Feb 2020 16:06:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C474420637 for ; Thu, 13 Feb 2020 16:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581609968; bh=1jBUdfWsHuGg8rPEnMV66fDGVZqo7eI+0SF9nRDwqdc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Rd66eT4evSVr4clOBcAPWa5GLnJuSkhFXGI2UCa9iRyMziHcXuh9k2azsDYw9V0Mt ybIMm7+UhyHcThMmZnwp2ROrRpvT9WOk4tgr9l/q/BIdpebN0KP3yo1Yt3HglebjxD AiSIZHxRLHvn0G2/cBTOVuqV6Pof3ZRUnFYdnq78= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729617AbgBMQGH (ORCPT ); Thu, 13 Feb 2020 11:06:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:35400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728009AbgBMPXl (ORCPT ); Thu, 13 Feb 2020 10:23:41 -0500 Received: from localhost (unknown [104.132.1.104]) (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 B201324689; Thu, 13 Feb 2020 15:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607420; bh=1jBUdfWsHuGg8rPEnMV66fDGVZqo7eI+0SF9nRDwqdc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SODoKnrG+b1da4b9zVhAXbyw+QP491bqHD3c5SVtNhMcewKz8tU6yfSeDJMFo8N35 QMk7nA+nR0oJjrrlTdNHzS3zxlh/1TsjnVax7bs0a8wqIEHBgLwk/4V8Yh6vgl7X/a GciSdan247E/R/PF6f/o8NVBA/Mb7qVnNe7/p+ks= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nick Finco , Marios Pomonis , Andrew Honig , Jim Mattson , Paolo Bonzini Subject: [PATCH 4.9 048/116] KVM: x86: Protect ioapic_write_indirect() from Spectre-v1/L1TF attacks Date: Thu, 13 Feb 2020 07:19:52 -0800 Message-Id: <20200213151901.504476491@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151842.259660170@linuxfoundation.org> References: <20200213151842.259660170@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: Marios Pomonis commit 670564559ca35b439c8d8861fc399451ddf95137 upstream. This fixes a Spectre-v1/L1TF vulnerability in ioapic_write_indirect(). This function contains index computations based on the (attacker-controlled) IOREGSEL register. This patch depends on patch "KVM: x86: Protect ioapic_read_indirect() from Spectre-v1/L1TF attacks". Fixes: 70f93dae32ac ("KVM: Use temporary variable to shorten lines.") Signed-off-by: Nick Finco Signed-off-by: Marios Pomonis Reviewed-by: Andrew Honig Cc: stable@vger.kernel.org Reviewed-by: Jim Mattson Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/ioapic.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -299,6 +300,7 @@ static void ioapic_write_indirect(struct ioapic_debug("change redir index %x val %x\n", index, val); if (index >= IOAPIC_NUM_PINS) return; + index = array_index_nospec(index, IOAPIC_NUM_PINS); e = &ioapic->redirtbl[index]; mask_before = e->fields.mask; /* Preserve read-only fields */