Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp458630imi; Fri, 22 Jul 2022 02:50:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1scjNtWHtXcCPVKrGHLgDXl0nrQZvXPeyM9NfJnkwYBYqU2lUCUw60w/63u4T+sGOqBZSov X-Received: by 2002:a17:902:7444:b0:16d:27a0:637e with SMTP id e4-20020a170902744400b0016d27a0637emr2852919plt.156.1658483432493; Fri, 22 Jul 2022 02:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658483432; cv=none; d=google.com; s=arc-20160816; b=ViZ/BUeQK5kYCbwKxpIYpcTbmP3QrjA59uK2JyLJGNKYtmRaUIjm+9XhsbSkvmmu+I rgd0WSErR3ar9BkwyFNL4FrzhGHcZOE+T4asyVaBtBNl/L31YZbo5IgS7f3BO91TKkpL nRKbpVTyx8b5TAAHy1n9+o0QYofWdMPkDk6eSxtY1zkWhN803VbtbtT3OG7+G3RGXdxJ Ht6dWyL2orC8EuDu55kJ9pw8qpGulVH1rjgZpe36ZMcO6VLmEyL0hwj6aTP2VY7g/U2o PLLCMlb8q4XSc1SvbZyRafurZ5uC5cKFlC+FccFXZhsa1zsBK9WdV5FBnY20JNvx//dN fpdQ== 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=vhDiPXLaigjZESXtRbzOMnnER6ftjicUy1IRC3gEQeA=; b=VeU+2bK86EWeWXdgbtMD5EFrwHvNxLSHxmNMauiYrl5XbicI/HQPm2tUxfUBvp46yG 3oUJyZFDfUSBBnGYcWY4CfRDfZx815xBzOueDmmNXXH3K6/jDrU4srdO/vt+XWZVPaQX v705T9NImCzkLpcsJxmvQbifz7mrB1oU2+w/D3gQicTLl9PFg83xFZYKkqMxWdVrjBRl l8wSL2HRRmBki1TTAsuzShiQOdrpui2obFtXCz1aVgtJUwuKbbX7mQ6JZQp1RfE1PBdF j7xKaJgXa8W7IRd5q2hnFyuMuJuUawpzHpOLN9507CAlsb22jBOX8I9ISE9MCq0ChqU/ 7xYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cCYlOHwe; 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 v202-20020a6361d3000000b0041a0a9d7ca0si5307185pgb.646.2022.07.22.02.50.16; Fri, 22 Jul 2022 02:50:32 -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=cCYlOHwe; 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 S235937AbiGVJXB (ORCPT + 99 others); Fri, 22 Jul 2022 05:23:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236039AbiGVJWZ (ORCPT ); Fri, 22 Jul 2022 05:22:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 282B6BF9B7; Fri, 22 Jul 2022 02:14:38 -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 7120A61FDF; Fri, 22 Jul 2022 09:14:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B489C341C6; Fri, 22 Jul 2022 09:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658481276; bh=6H9Lyl9oIAdqchAN6Gj+v6lW5keext/SAPl2qXlkcwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cCYlOHweN81SlxJ5jCx7BDZPXztZne6n2EA4B5NKt9nOdzW0aak06E0C0ONVyFqtM 459EG6tc/U1c632ogRHiAm/FgKF9vsQ8m60zg76CpAQfdw9hzYbGttsHgjg+DsPkhu OoYirLo4G595GGtCXK5Xb6L6n2v3hIuLRsVhYPzU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kim Phillips , "Peter Zijlstra (Intel)" , Borislav Petkov , Josh Poimboeuf , Thadeu Lima de Souza Cascardo Subject: [PATCH 5.15 37/89] x86/sev: Avoid using __x86_return_thunk Date: Fri, 22 Jul 2022 11:11:11 +0200 Message-Id: <20220722091135.437412058@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220722091133.320803732@linuxfoundation.org> References: <20220722091133.320803732@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: Kim Phillips commit 0ee9073000e8791f8b134a8ded31bcc767f7f232 upstream. Specifically, it's because __enc_copy() encrypts the kernel after being relocated outside the kernel in sme_encrypt_execute(), and the RET macro's jmp offset isn't amended prior to execution. Signed-off-by: Kim Phillips Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Borislav Petkov Reviewed-by: Josh Poimboeuf Signed-off-by: Borislav Petkov Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman --- arch/x86/mm/mem_encrypt_boot.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/arch/x86/mm/mem_encrypt_boot.S +++ b/arch/x86/mm/mem_encrypt_boot.S @@ -65,7 +65,9 @@ SYM_FUNC_START(sme_encrypt_execute) movq %rbp, %rsp /* Restore original stack pointer */ pop %rbp - RET + /* Offset to __x86_return_thunk would be wrong here */ + ret + int3 SYM_FUNC_END(sme_encrypt_execute) SYM_FUNC_START(__enc_copy) @@ -151,6 +153,8 @@ SYM_FUNC_START(__enc_copy) pop %r12 pop %r15 - RET + /* Offset to __x86_return_thunk would be wrong here */ + ret + int3 .L__enc_copy_end: SYM_FUNC_END(__enc_copy)