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=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 9C714C432C0 for ; Wed, 27 Nov 2019 21:13:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7093221556 for ; Wed, 27 Nov 2019 21:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889183; bh=0mfKnqG4mH4LuWb2SZO7gF8jbUWaMBscu09hSclwSsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EgD7sRVVsEoo+JHmAShwkVGu8FN4odY8h6jx8fYZQUyQB1wj4z1RTZVb23UtNp8Sa nHAEASaGAxNTljM7xX0eUPx+VC6+xW66X0DdG6CnDerBC7gMcbQP0R3uoAbjZ9USyd aT3zEvmTfeGgfxNLuGO+OBKlRSzJoAflSb9c/gOw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387417AbfK0VNC (ORCPT ); Wed, 27 Nov 2019 16:13:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:44558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387406AbfK0VM7 (ORCPT ); Wed, 27 Nov 2019 16:12:59 -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 DF0A021556; Wed, 27 Nov 2019 21:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889179; bh=0mfKnqG4mH4LuWb2SZO7gF8jbUWaMBscu09hSclwSsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tAypsqOk5WxDPXlmIf2PwbNW4j9e9J9GCEDi8ez7W5RoVMGvnoQtxXE3XXFGx9632 bWJjNPhmC/iCKa1izW+1XQI/XlhMJDoPWm9Vu9BDPDGp3Xp6QwOag5dCOqtqMA1hT+ ewm4FVgUm7MdSjyOoNslDG35ffa8C4KXbETlpiz4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lai Jiangshan , "Peter Zijlstra (Intel)" , Andy Lutomirski , stable@kernel.org Subject: [PATCH 5.4 19/66] x86/entry/32: Fix IRET exception Date: Wed, 27 Nov 2019 21:32:14 +0100 Message-Id: <20191127202654.282045144@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202632.536277063@linuxfoundation.org> References: <20191127202632.536277063@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: Peter Zijlstra commit 40ad2199580e248dce2a2ebb722854180c334b9e upstream. As reported by Lai, the commit 3c88c692c287 ("x86/stackframe/32: Provide consistent pt_regs") wrecked the IRET EXTABLE entry by making .Lirq_return not point at IRET. Fix this by placing IRET_FRAME in RESTORE_REGS, to mirror how FIXUP_FRAME is part of SAVE_ALL. Fixes: 3c88c692c287 ("x86/stackframe/32: Provide consistent pt_regs") Reported-by: Lai Jiangshan Signed-off-by: Peter Zijlstra (Intel) Acked-by: Andy Lutomirski Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- arch/x86/entry/entry_32.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -357,6 +357,7 @@ 2: popl %es 3: popl %fs POP_GS \pop + IRET_FRAME .pushsection .fixup, "ax" 4: movl $0, (%esp) jmp 1b @@ -1075,7 +1076,6 @@ restore_all: /* Restore user state */ RESTORE_REGS pop=4 # skip orig_eax/error_code .Lirq_return: - IRET_FRAME /* * ARCH_HAS_MEMBARRIER_SYNC_CORE rely on IRET core serialization * when returning from IPI handler and when returning from