linux-kernel - [PATCH] x86-64: Fix CFI data for common

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1329833177-13030-1-git-send-email-mjw@redhat.com>
Date:	Tue, 21 Feb 2012 15:06:13 +0100
From:	Mark Wielaard <mjw@...hat.com>
To:	linux-kernel@...r.kernel.org
Cc:	Mark Wielaard <mjw@...hat.com>,
	Thomas Gleixner <tglx@...utronix.de> (maintainer:X86
	ARCHITECTURE...),
	Ingo Molnar <mingo@...hat.com> (maintainer:X86 ARCHITECTURE... 
	,commit_signer:11/25=44%),
	"H. Peter Anvin" <hpa@...or.com> (maintainer:X86 ARCHITECTURE... 
	,commit_signer:4/25=16%),
	x86@...nel.org (maintainer:X86 ARCHITECTURE...),
	Andi Kleen <ak@...ux.intel.com> (commit_signer:5/25=20%),
	Jan Beulich <jbeulich@...e.com> (commit_signer:5/25=20%),
	Frederic Weisbecker <fweisbec@...il.com> (commit_signer:4/25=16%)
Subject: [PATCH] x86-64: Fix CFI data for common_interrupt

Commit eab9e6 "x86-64: Fix CFI data for interrupt frames" introduced
a DW_CFA_def_cfa_expression in the SAVE_ARGS_IRQ macro. To later define
the CFA using a simple register+offset rule both register and offset
need to be supplied. Just using CFI_DEF_CFA_REGISTER leaves the offset
undefined. So use CFI_DEF_CFA with reg+off explicitly at the end of
common_interrupt.

Signed-off-by: Mark Wielaard <mjw@...hat.com>
---
 arch/x86/kernel/entry_64.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 3fe8239..e00ef55 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -813,7 +813,7 @@ ret_from_intr:
 
 	/* Restore saved previous stack */
 	popq %rsi
-	CFI_DEF_CFA_REGISTER	rsi
+	CFI_DEF_CFA rsi,0	/* needed after def_cfa_expression */
 	leaq ARGOFFSET-RBP(%rsi), %rsp
 	CFI_DEF_CFA_REGISTER	rsp
 	CFI_ADJUST_CFA_OFFSET	RBP-ARGOFFSET
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/