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 7F3F4C352A3 for ; Mon, 10 Feb 2020 13:15:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FB6220714 for ; Mon, 10 Feb 2020 13:15:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581340536; bh=A/2U5VX3ZwwTAy8Oy69vmzKMOlRkiaXXOgPpFnlDUzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KIIl0u7yAJqsZ5Yf8JyhbBcwAN088P6awSnHEPF3DMZ/OvB0n5ehKZTJkL25gfoOo Uh+n0+p3NRLN8jTGkOyX6W/vUXAGGSFttttzYiJi5MbMotsp5z3E8qv/tA1qz3anQK WiEoAYOeABrvlhHpf7qU9TY8rOhEJt2K452CuLUw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729119AbgBJMiU (ORCPT ); Mon, 10 Feb 2020 07:38:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:33546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729108AbgBJMiT (ORCPT ); Mon, 10 Feb 2020 07:38:19 -0500 Received: from localhost (unknown [209.37.97.194]) (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 19A3B2085B; Mon, 10 Feb 2020 12:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338298; bh=A/2U5VX3ZwwTAy8Oy69vmzKMOlRkiaXXOgPpFnlDUzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UjAVeufyrcw2Vi05zCmi4nL65o01BjRa+7siFCG9Hdj4nteCfNM/9z65xFyf4wV7g DxMWxF/yGpIIVMw4NsFhidzuaWQq/JQ4usz4K96mroySxllx2nJWwB6tokD55IyvAu Qsoh/sMUlSzKRM/PTiWifl50oI9FQ4c2LjvBl1yg= 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 5.4 206/309] KVM: x86: Protect ioapic_read_indirect() from Spectre-v1/L1TF attacks Date: Mon, 10 Feb 2020 04:32:42 -0800 Message-Id: <20200210122426.341223766@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122406.106356946@linuxfoundation.org> References: <20200210122406.106356946@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: Marios Pomonis commit 8c86405f606ca8508b8d9280680166ca26723695 upstream. This fixes a Spectre-v1/L1TF vulnerability in ioapic_read_indirect(). This function contains index computations based on the (attacker-controlled) IOREGSEL register. Fixes: a2c118bfab8b ("KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798)") 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -68,13 +69,14 @@ static unsigned long ioapic_read_indirec default: { u32 redir_index = (ioapic->ioregsel - 0x10) >> 1; - u64 redir_content; + u64 redir_content = ~0ULL; - if (redir_index < IOAPIC_NUM_PINS) - redir_content = - ioapic->redirtbl[redir_index].bits; - else - redir_content = ~0ULL; + if (redir_index < IOAPIC_NUM_PINS) { + u32 index = array_index_nospec( + redir_index, IOAPIC_NUM_PINS); + + redir_content = ioapic->redirtbl[index].bits; + } result = (ioapic->ioregsel & 0x1) ? (redir_content >> 32) & 0xffffffff :