41272101db
This changes maybe_disable_address_space_randomization to be an RAII class, rather than having it return a cleanup. Regression tested by the buildbot. ChangeLog 2017-11-26 Tom Tromey <tom@tromey.com> * nat/linux-personality.h (class maybe_disable_address_space_randomization): New class. (maybe_disable_address_space_randomization): Don't declare function. * nat/linux-personality.c (restore_personality) (make_disable_asr_cleanup): Remove. (maybe_disable_address_space_randomization): Now a constructor. (~maybe_disable_address_space_randomization): New destructor. * linux-nat.c (linux_nat_create_inferior): Update. gdbserver/ChangeLog 2017-11-26 Tom Tromey <tom@tromey.com> * linux-low.c (linux_create_inferior): Update.
69 lines
2.1 KiB
C
69 lines
2.1 KiB
C
/* Disable address space randomization based on inferior personality.
|
|
|
|
Copyright (C) 2008-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "common-defs.h"
|
|
#include "nat/linux-personality.h"
|
|
|
|
#ifdef HAVE_PERSONALITY
|
|
# include <sys/personality.h>
|
|
# if !HAVE_DECL_ADDR_NO_RANDOMIZE
|
|
# define ADDR_NO_RANDOMIZE 0x0040000
|
|
# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */
|
|
#endif /* HAVE_PERSONALITY */
|
|
|
|
/* See comment on nat/linux-personality.h. */
|
|
|
|
maybe_disable_address_space_randomization::
|
|
maybe_disable_address_space_randomization (int disable_randomization)
|
|
: m_personality_set (false),
|
|
m_personality_orig (0)
|
|
{
|
|
#ifdef HAVE_PERSONALITY
|
|
if (disable_randomization)
|
|
{
|
|
errno = 0;
|
|
m_personality_orig = personality (0xffffffff);
|
|
if (errno == 0 && !(m_personality_orig & ADDR_NO_RANDOMIZE))
|
|
{
|
|
m_personality_set = true;
|
|
personality (m_personality_orig | ADDR_NO_RANDOMIZE);
|
|
}
|
|
if (errno != 0 || (m_personality_set
|
|
&& !(personality (0xffffffff) & ADDR_NO_RANDOMIZE)))
|
|
warning (_("Error disabling address space randomization: %s"),
|
|
safe_strerror (errno));
|
|
}
|
|
#endif /* HAVE_PERSONALITY */
|
|
}
|
|
|
|
maybe_disable_address_space_randomization::
|
|
~maybe_disable_address_space_randomization ()
|
|
{
|
|
#ifdef HAVE_PERSONALITY
|
|
|
|
if (m_personality_set)
|
|
{
|
|
errno = 0;
|
|
personality (m_personality_orig);
|
|
if (errno != 0)
|
|
warning (_("Error restoring address space randomization: %s"),
|
|
safe_strerror (errno));
|
|
}
|
|
#endif /* HAVE_PERSONALITY */
|
|
}
|