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=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 0948EC43444 for ; Mon, 7 Jan 2019 12:54:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C34A420651 for ; Mon, 7 Jan 2019 12:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546865672; bh=rj1yTAsWEwFHCf0bEqXlYqEbpvWrVlm22kQrzepPKTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zIMEtdil7IXTf5CGKopdo6v+fSDyKhzYyJAJ+gH8fOFAv2ZvpEl2c5VYC9niMnodn SqIVNPEE/wo1kREzZRB4PVfxyb8LfQF5eb/f2z3c79E1P/HV38Bp+ck+wy4XNXOAo6 AyrkK63108GHd3u88p3fq/I/PuKcCpfWAlMDtadM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727763AbfAGMxf (ORCPT ); Mon, 7 Jan 2019 07:53:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:42818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727726AbfAGMxf (ORCPT ); Mon, 7 Jan 2019 07:53:35 -0500 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 B55FB20651; Mon, 7 Jan 2019 12:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546865615; bh=rj1yTAsWEwFHCf0bEqXlYqEbpvWrVlm22kQrzepPKTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j0UPkT1DZ1zpxEuaHoTkFBToVHDODAsadokCdk0MSdOvxKwYC6DOCq9mLcPhdiiyd LRG/ALIr9JhX1iQp9UyiRuq+b2WSV112F6IZTYEWdp8wQjX1QT6s8Z6BQNwxkm9JWs uB1/JLcEg5Lr6hPQzk4KjUHg5K8Ix5QJi4kFI1Yo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Diana Craciun , Michael Ellerman Subject: [PATCH 4.19 064/170] powerpc/fsl: Fix spectre_v2 mitigations reporting Date: Mon, 7 Jan 2019 13:31:31 +0100 Message-Id: <20190107104500.587001267@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107104452.953560660@linuxfoundation.org> References: <20190107104452.953560660@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Diana Craciun commit 7d8bad99ba5a22892f0cad6881289fdc3875a930 upstream. Currently for CONFIG_PPC_FSL_BOOK3E the spectre_v2 file is incorrect: $ cat /sys/devices/system/cpu/vulnerabilities/spectre_v2 "Mitigation: Software count cache flush" Which is wrong. Fix it to report vulnerable for now. Fixes: ee13cb249fab ("powerpc/64s: Add support for software count cache flush") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Diana Craciun Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/powerpc/kernel/security.c +++ b/arch/powerpc/kernel/security.c @@ -22,7 +22,7 @@ enum count_cache_flush_type { COUNT_CACHE_FLUSH_SW = 0x2, COUNT_CACHE_FLUSH_HW = 0x4, }; -static enum count_cache_flush_type count_cache_flush_type; +static enum count_cache_flush_type count_cache_flush_type = COUNT_CACHE_FLUSH_NONE; bool barrier_nospec_enabled; static bool no_nospec;