From: Jiri Olsa Date: Mon, 29 Aug 2011 13:14:51 +0000 (-0400) Subject: rtld, i386: Fix cfi directive in audit trampoline code X-Git-Tag: glibc-2.15~370^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbeb5f4db12dccb985ee10eb87fe00b46562b796;p=thirdparty%2Fglibc.git rtld, i386: Fix cfi directive in audit trampoline code _dl_runtime_profile function has wrong cfi directive when rewinding stack back for the pltexit path. Only 8 bytes - 2 'pop edx' instructions from the pltentry-only code should be rewinded back. With attached patch, I'm able to rewind stack correctly throught the rtld code from audit library callback. --- diff --git a/ChangeLog b/ChangeLog index ab754e5f8c1..5adcddc8a42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-08-29 Jiri Olsa + + * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi + directive. + 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S index 73b08ba67e4..19e313e6ba3 100644 --- a/sysdeps/i386/dl-trampoline.S +++ b/sysdeps/i386/dl-trampoline.S @@ -1,5 +1,5 @@ /* PLT trampolines. i386 version. - Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -99,7 +99,7 @@ _dl_runtime_profile: +4 %edx %esp free */ - cfi_adjust_cfa_offset (12) + cfi_adjust_cfa_offset (8) 1: movl %ebx, (%esp) cfi_rel_offset (ebx, 0) movl %edx, %ebx # This is the frame buffer size