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=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 3B057C2BA83 for ; Sun, 9 Feb 2020 18:51:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05DBD20733 for ; Sun, 9 Feb 2020 18:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581274271; bh=WDRwRInItWiMY6XwZKELgn9SyAP4XMRb3EoNvIBjwkA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=A3BG2K1VMQKsy68+N+COajtMw+0M9PF6a25rlRRlU3O67L/0ZfZ3Do6Dg9OeeAF39 XPWzGarvl5ZqW4RS9O+JrGV9+d3vXBRT3vtBjlHsFefA1KlJdtRH6wv2041QBCOXeh we2Yvuv8Nbb+jAAPYdxgPHMjzX3MsiywpUtjtqsE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727409AbgBISvK (ORCPT ); Sun, 9 Feb 2020 13:51:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:58300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727404AbgBISvK (ORCPT ); Sun, 9 Feb 2020 13:51:10 -0500 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 6719320708; Sun, 9 Feb 2020 18:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581274269; bh=WDRwRInItWiMY6XwZKELgn9SyAP4XMRb3EoNvIBjwkA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ya3ekBfp9cazUDXRNbX6mrWOI0nQSpYQoH1MgEoem2xjToEy8ytNk7bVcM4JaBPkD K42KGeE6GYsXzwf4Kp+qsa9r+M8fyNY1t6bavkNUTU+rdYed6pAmvNs2oeSzSYiy2J 6g4dL7+RkEQvL8mRIl9Mc+lrbyDqD7q9qtAlcX7Y= Date: Sun, 9 Feb 2020 13:51:08 -0500 From: Sasha Levin To: gregkh@linuxfoundation.org Cc: pomonis@google.com, ahonig@google.com, jmattson@google.com, nifi@google.com, pbonzini@redhat.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks" failed to apply to 4.14-stable tree Message-ID: <20200209185108.GR3584@sasha-vm> References: <158124937222923@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <158124937222923@kroah.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Sun, Feb 09, 2020 at 12:56:12PM +0100, gregkh@linuxfoundation.org wrote: > >The patch below does not apply to the 4.14-stable tree. >If someone wants it applied there, or to any other stable or longterm >tree, then please email the backport, including the original git commit >id to . > >thanks, > >greg k-h > >------------------ original commit in Linus's tree ------------------ > >>From 66061740f1a487f4ed54fde75e724709f805da53 Mon Sep 17 00:00:00 2001 >From: Marios Pomonis >Date: Wed, 11 Dec 2019 12:47:53 -0800 >Subject: [PATCH] KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks > >This fixes Spectre-v1/L1TF vulnerabilities in intel_find_fixed_event() >and intel_rdpmc_ecx_to_pmc(). >kvm_rdpmc() (ancestor of intel_find_fixed_event()) and >reprogram_fixed_counter() (ancestor of intel_rdpmc_ecx_to_pmc()) are >exported symbols so KVM should treat them conservatively from a security >perspective. > >Fixes: 25462f7f5295 ("KVM: x86/vPMU: Define kvm_pmu_ops to support vPMU function dispatch") > >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 Conflict due to missing 0e6f467ee28e ("KVM: x86/pmu: mask the result of rdpmc according to the width of the counters"). I've fixed it and queued for 4.14-4.4. -- Thanks, Sasha