From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2254dqc8yMEqLrZuiqNDhe2ANkZxaTUHP6rLMrzQgo6j8nvFV/hJjs0gR/Qk7WvHdd19VTOV ARC-Seal: i=1; a=rsa-sha256; t=1516611218; cv=none; d=google.com; s=arc-20160816; b=vfrJ3HlH4xHbwkhkgLPuKecIDF/j4p3JpDNd3GO7f3dbbMs7uP8ZwHdPJRscP7h+EY 5hrRaZUpgXSeMMlO2lj9erDD5AuUvZTho98/ZkmCLh1wtf7N1ydQZ1WBAgpa1QQyaqh/ rST7hvblF1ZlPE8LLX6t3SpMMqNdv2MK6nB4I6MJeQkS7s8IK4rbwjJqZa3ixvbmjR4/ KIEjY88ioBKfJZ1eDSRiSEtAzmCaYIsl9Hn6HqFQUTaEug1EJxzGGnYe2sHP+DoZacJX 1s/7AeUk63K4Dsd4+UCk+EMIvLXRtb/wRlZfzbAQ+EMtYBWVktr3B6i6YhInUVbW+pHt e7rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=SIVB55iC9FTapcn7yxtShGFkg8tvAHurZO0jbF0acco=; b=HGye4xyTYLyxMVEHaq2u7qQSBMTv/RI5u1OD8x5MtBPFoRS1G/zNDxhHHQNIZSESy4 pJWuhi/hgz7UbZ34xLhbJ9TEQ2OnGBrSqDjnrFqy5xhPx54jN6KoOwFzlvhg3/O+jUM9 mN1SPmJsqDZWnC1z4p8V/IzujVsdma0vvoG5PIOT26Eb2IO1pFoYqHDX+0TA87Xe0FhP xvmE1f+5sNFVATYuQ0CJbN1qc2U4gQHLyQ9O4DMbowBVpgMGUPD3NdfOLQubpNLvYUy6 wA7WecEmdyEBCd02lTO40yEIQt5JZNVFdaajbCyJ9PKNthGihPL0XxjWs28GC9E3KhB8 PT/A== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laura Abbott , Tom Lendacky , Ingo Molnar , Linus Torvalds Subject: [PATCH 4.14 76/89] x86: Use __nostackprotect for sme_encrypt_kernel Date: Mon, 22 Jan 2018 09:45:56 +0100 Message-Id: <20180122084002.057118605@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590282124633611412?= X-GMAIL-MSGID: =?utf-8?q?1590282124633611412?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Laura Abbott commit 91cfc88c66bf8ab95937606569670cf67fa73e09 upstream. Commit bacf6b499e11 ("x86/mm: Use a struct to reduce parameters for SME PGD mapping") moved some parameters into a structure. The structure was large enough to trigger the stack protection canary in sme_encrypt_kernel which doesn't work this early, causing reboots. Mark sme_encrypt_kernel appropriately to not use the canary. Fixes: bacf6b499e11 ("x86/mm: Use a struct to reduce parameters for SME PGD mapping") Signed-off-by: Laura Abbott Cc: Tom Lendacky Cc: Ingo Molnar Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/x86/mm/mem_encrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -487,7 +487,7 @@ static unsigned long __init sme_pgtable_ return total; } -void __init sme_encrypt_kernel(struct boot_params *bp) +void __init __nostackprotector sme_encrypt_kernel(struct boot_params *bp) { unsigned long workarea_start, workarea_end, workarea_len; unsigned long execute_start, execute_end, execute_len;