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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 EDAD7C432C0 for ; Wed, 27 Nov 2019 21:10:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5D342086A for ; Wed, 27 Nov 2019 21:10:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889028; bh=zBhu2+KdYMb3Yub8SsyOlnjWpHgy8s+5nopaN6TD0kU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CTtgYQ4TEFpQQ3vDWM8+OofVIOjLMdGvNcAzqU6YnZmjnBriSnM0tFuuB4h9ty79I Mh9MVFTla5fERpnupZaGPXqOrCoFxOMHZVJNYQgyxAblG62rDLth4LL5x/KbVOc1Bs PhC4DjUuvRiU4Jt/4ZTYr0JdtUCOYkNHY/8QLZS8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733044AbfK0VK1 (ORCPT ); Wed, 27 Nov 2019 16:10:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:37470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733009AbfK0VKW (ORCPT ); Wed, 27 Nov 2019 16:10:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 45ECB2176D; Wed, 27 Nov 2019 21:10:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889021; bh=zBhu2+KdYMb3Yub8SsyOlnjWpHgy8s+5nopaN6TD0kU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jGDCKWr5ryy7yyI2TxiJkK7pBrE4UMTP4z4scMCKdJTefy8Z2Ur77kkzzPjricRp7 opBONsV+M7stedgcU5cadYSOgxcJErMy3f2kVgr6/ApBlk+/3632lniAm0Dv5nt81B oMHcAusECLHAr7Aq9hL5F1luGE66fZV6g592fa1E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Lutomirski , "Peter Zijlstra (Intel)" , stable@kernel.org Subject: [PATCH 5.3 54/95] x86/doublefault/32: Fix stack canaries in the double fault handler Date: Wed, 27 Nov 2019 21:32:11 +0100 Message-Id: <20191127202920.122041147@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202845.651587549@linuxfoundation.org> References: <20191127202845.651587549@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Lutomirski commit 3580d0b29cab08483f84a16ce6a1151a1013695f upstream. The double fault TSS was missing GS setup, which is needed for stack canaries to work. Signed-off-by: Andy Lutomirski Signed-off-by: Peter Zijlstra (Intel) Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/doublefault.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/x86/kernel/doublefault.c +++ b/arch/x86/kernel/doublefault.c @@ -65,6 +65,9 @@ struct x86_hw_tss doublefault_tss __cach .ss = __KERNEL_DS, .ds = __USER_DS, .fs = __KERNEL_PERCPU, +#ifndef CONFIG_X86_32_LAZY_GS + .gs = __KERNEL_STACK_CANARY, +#endif .__cr3 = __pa_nodebug(swapper_pg_dir), };