Skip to contentSkip to conversation

x86_64, dwarf2: push pushes 8 bytes and popf pops 8

PATCH Applied Alexander van Heukelum 2 participants 2 messages Jul 22, 2008 – Jul 24, 2008 x86

lore
Share & tools
lore
#0 lore raw

The CFI_ADJUST_CFA_OFFSET dwarf2 annotation of a push/popf pair in ret_from_fork wrongly used a value of 4. It should have been 8. Fix that.

arch/x86/kernel/entry_64.S +2 -2
index ae63e58..5f6cac6 100644
@@ -269,9 +269,9 @@ ENTRY(native_usergs_sysret64)
 ENTRY(ret_from_fork)
 	CFI_DEFAULT_STACK
 	push kernel_eflags(%rip)
-	CFI_ADJUST_CFA_OFFSET 4
+	CFI_ADJUST_CFA_OFFSET 8
 	popf				# reset kernel eflags
-	CFI_ADJUST_CFA_OFFSET -4
+	CFI_ADJUST_CFA_OFFSET -8
 	call schedule_tail
 	GET_THREAD_INFO(%rcx)
 	testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
Applied
#1 lore raw
Quoted 3 lines · Alexander van Heukelum

The CFI_ADJUST_CFA_OFFSET dwarf2 annotation of a push/popf pair in ret_from_fork wrongly used a value of 4. It should have been 8. Fix that.

applied to tip/x86/debug - thanks Alexander.

Ingo