Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp1365749imi; Sat, 23 Jul 2022 03:47:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vPPOTvzBcwkjYE6SHLYY9hzb7Evyh1k+sXuiqbVj65I5FLD/hwqNc2uMWcq9/qk8F9rCcV X-Received: by 2002:a05:6402:1e95:b0:437:ce7f:e17a with SMTP id f21-20020a0564021e9500b00437ce7fe17amr3752058edf.169.1658573242200; Sat, 23 Jul 2022 03:47:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658573242; cv=none; d=google.com; s=arc-20160816; b=Wk0PJYccOAfqLHophMY+p7vJsRwerpEVYwvqhO59Q90nV9i+vr4jd0JguQnwKKoLZ0 /wEGvu/1vaH1A1jxAzwibPzRj8Ju86E+8aJ96rN7SL9ZOAR1AclAG5moTUE5+jUjCqfl vkZ/BanyWXgBsPr5zr5DNdxqrQedjghujhV2seRp/H4J8JA+trT2qyB7amG8r+hD+xUb /ibtmnTPRiHVWDan+K6GVr7Cr2ZQNAY3j6JDZ37ou/9GtJ/LKNyIDypqrcJNDNkYpsOw +iJqP+6ZMtcVsP71q8RHFDhTXz9yAcwEFGW+mgCYzAo5TvyBX6GY6McIQ2jZ2+jRqQpk DHkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OLKZ1GahCiOVgnkQ+balOPQRO/HG9LMdrYIB8dauyPI=; b=MqO+dXXQW79Yn00IPkLlckvSpXxWT4y4Hlb+rBcSl7BtcgNH0wLtOxA5HafQ8jKBpc oaut0oBm9rqvuj0bHjgcgRZjdf5rtaF6mRGMIZDFqhiOG50QhXl9u+/cYVDsmDod8XUV S77jOGRYqad5kY9/JMIPPb3Nl4bE1ZVyun1PMXIyJWJWrFRtVZZ12qewekMQAckgcTDw rHaiwWnSFVA5Lt9qYufos/TcIIXfb56khzsBDWVZpN1nZYISOM+BEdlBXrJrncWnbx24 iGNGDJSeORGG9Rfs7wsXwGkaBNWv7jGEwwcyd7Bsy6/v+9HYFVG0HqF+ID7CszcabLHn zx2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RTTBsgfo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w23-20020a1709062f9700b0072a4b4fb1e0si2343354eji.911.2022.07.23.03.46.54; Sat, 23 Jul 2022 03:47:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RTTBsgfo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239148AbiGWKMT (ORCPT + 99 others); Sat, 23 Jul 2022 06:12:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239188AbiGWKJX (ORCPT ); Sat, 23 Jul 2022 06:09:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A95CDCBD11; Sat, 23 Jul 2022 03:02:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 55DFA61274; Sat, 23 Jul 2022 10:02:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FC1EC341C0; Sat, 23 Jul 2022 10:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658570553; bh=o4/srVdodmfnh4pywnFMEK+V/2gNOqg0RGT2S3PRrWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RTTBsgfo0Pkl7aJ0TN341qKH8Myk0hcAtWOVrDZXySyHOvbAv0vwC77XO9Uv6SKBG jC8x5RGZ70V+5huEeBiLvHmBsBAUB0cWLGLDNmgcd4VOL1IQ0HVaoueeS+4seJqlkb rdQ82DqlM1493eqeuEPWhKnyPlS3j9zjXS9hVstU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pawan Gupta , Borislav Petkov , Ben Hutchings Subject: [PATCH 5.10 126/148] x86/bugs: Add Cannon lake to RETBleed affected CPU list Date: Sat, 23 Jul 2022 11:55:38 +0200 Message-Id: <20220723095259.574769949@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220723095224.302504400@linuxfoundation.org> References: <20220723095224.302504400@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pawan Gupta commit f54d45372c6ac9c993451de5e51312485f7d10bc upstream. Cannon lake is also affected by RETBleed, add it to the list. Fixes: 6ad0ad2bf8a6 ("x86/bugs: Report Intel retbleed vulnerability") Signed-off-by: Pawan Gupta Signed-off-by: Borislav Petkov Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/common.c | 1 + 1 file changed, 1 insertion(+) --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1129,6 +1129,7 @@ static const struct x86_cpu_id cpu_vuln_ VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), + VULNBL_INTEL_STEPPINGS(CANNONLAKE_L, X86_STEPPING_ANY, RETBLEED), VULNBL_INTEL_STEPPINGS(ICELAKE_L, X86_STEPPING_ANY, MMIO | MMIO_SBDS | RETBLEED), VULNBL_INTEL_STEPPINGS(ICELAKE_D, X86_STEPPING_ANY, MMIO), VULNBL_INTEL_STEPPINGS(ICELAKE_X, X86_STEPPING_ANY, MMIO),