diff options
author | Sergio Durigan Junior <sergiodj@redhat.com> | 2015-01-15 15:10:49 -0500 |
---|---|---|
committer | Sergio Durigan Junior <sergiodj@redhat.com> | 2015-01-15 15:10:49 -0500 |
commit | 8cc73a3902a68269626274e15d7c25bef0a61759 (patch) | |
tree | ac425182a79a90d9636ec4c618f64325c062c20a /gdb/gdbserver/linux-low.c | |
parent | fb23d554428f1d379fd8c3e959a294108fa59f88 (diff) | |
download | gdb-8cc73a3902a68269626274e15d7c25bef0a61759.zip gdb-8cc73a3902a68269626274e15d7c25bef0a61759.tar.gz gdb-8cc73a3902a68269626274e15d7c25bef0a61759.tar.bz2 |
Move code to disable ASR to nat/
This patch moves the shared code present on
gdb/linux-nat.c:linux_nat_create_inferior and
gdb/gdbserver/linux-low.c:linux_create_inferior to
nat/linux-personality.c. This code is responsible for disabling
address space randomization based on user setting, and using
<sys/personality.h> to do that. I decided to put the prototype of the
maybe_disable_address_space_randomization on nat/linux-osdata.h
because it seemed the best place to put it.
I regression-tested this patch on Fedora 20 x86_64, and found no
regressions.
gdb/ChangeLog
2015-01-15 Sergio Durigan Junior <sergiodj@redhat.com>
* Makefile.in (HFILES_NO_SRCDIR): Add nat/linux-personality.h.
(linux-personality.o): New rule.
* common/common-defs.h: Include <stdint.h>.
* config/aarch64/linux.mh (NATDEPFILES): Include
linux-personality.o.
* config/alpha/alpha-linux.mh (NATDEPFILES): Likewise.
* config/arm/linux.mh (NATDEPFILES): Likewise.
* config/i386/linux64.mh (NATDEPFILES): Likewise.
* config/i386/linux.mh (NATDEPFILES): Likewise.
* config/ia64/linux.mh (NATDEPFILES): Likewise.
* config/m32r/linux.mh (NATDEPFILES): Likewise.
* config/m68k/linux.mh (NATDEPFILES): Likewise.
* config/mips/linux.mh (NATDEPFILES): Likewise.
* config/pa/linux.mh (NATDEPFILES): Likewise.
* config/powerpc/linux.mh (NATDEPFILES): Likewise.
* config/powerpc/ppc64-linux.mh (NATDEPFILES): Likewise.
* config/powerpc/spu-linux.mh (NATDEPFILES): Likewise.
* config/s390/linux.mh (NATDEPFILES): Likewise.
* config/sparc/linux64.mh (NATDEPFILES): Likewise.
* config/sparc/linux.mh (NATDEPFILES): Likewise.
* config/tilegx/linux.mh (NATDEPFILES): Likewise.
* config/xtensa/linux.mh (NATDEPFILES): Likewise.
* defs.h: Remove #include <stdint.h> (moved to
common/common-defs.h).
* linux-nat.c: Include nat/linux-personality.h. Remove #include
<sys/personality.h>; do not define ADDR_NO_RANDOMIZE (moved to
nat/linux-personality.c).
(linux_nat_create_inferior): Remove code to disable address space
randomization (moved to nat/linux-personality.c). Create cleanup
to disable address space randomization.
* nat/linux-personality.c: New file.
* nat/linux-personality.h: Likewise.
gdb/gdbserver/ChangeLog
2015-01-15 Sergio Durigan Junior <sergiodj@redhat.com>
* Makefile.in (SFILES): Add linux-personality.c.
(linux-personality.o): New rule.
* configure.srv (srv_linux_obj): Add linux-personality.o to the
list of objects to be built.
* linux-low.c: Include nat/linux-personality.h.
(linux_create_inferior): Remove code to disable address space
randomization (moved to ../nat/linux-personality.c). Create
cleanup to disable address space randomization.
Diffstat (limited to 'gdb/gdbserver/linux-low.c')
-rw-r--r-- | gdb/gdbserver/linux-low.c | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 4d19c87..5e37dd5 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -27,6 +27,7 @@ #include <sys/ptrace.h> #include "nat/linux-ptrace.h" #include "nat/linux-procfs.h" +#include "nat/linux-personality.h" #include <signal.h> #include <sys/ioctl.h> #include <fcntl.h> @@ -597,29 +598,11 @@ add_lwp (ptid_t ptid) static int linux_create_inferior (char *program, char **allargs) { -#ifdef HAVE_PERSONALITY - int personality_orig = 0, personality_set = 0; -#endif struct lwp_info *new_lwp; int pid; ptid_t ptid; - -#ifdef HAVE_PERSONALITY - if (disable_randomization) - { - errno = 0; - personality_orig = personality (0xffffffff); - if (errno == 0 && !(personality_orig & ADDR_NO_RANDOMIZE)) - { - personality_set = 1; - personality (personality_orig | ADDR_NO_RANDOMIZE); - } - if (errno != 0 || (personality_set - && !(personality (0xffffffff) & ADDR_NO_RANDOMIZE))) - warning ("Error disabling address space randomization: %s", - strerror (errno)); - } -#endif + struct cleanup *restore_personality + = maybe_disable_address_space_randomization (disable_randomization); #if defined(__UCLIBC__) && defined(HAS_NOMMU) pid = vfork (); @@ -665,16 +648,7 @@ linux_create_inferior (char *program, char **allargs) _exit (0177); } -#ifdef HAVE_PERSONALITY - if (personality_set) - { - errno = 0; - personality (personality_orig); - if (errno != 0) - warning ("Error restoring address space randomization: %s", - strerror (errno)); - } -#endif + do_cleanups (restore_personality); linux_add_process (pid, 0); |