Make EXEC_BACKEND more convenient on Linux and FreeBSD.

Try to disable ASLR when building in EXEC_BACKEND mode, to avoid random
memory mapping failures while testing.  For developer use only, no
effect on regular builds.

Suggested-by: Andres Freund <andres@anarazel.de>
Tested-by: Bossart, Nathan <bossartn@amazon.com>
Discussion: https://postgr.es/m/20210806032944.m4tz7j2w47mant26%40alap3.anarazel.de
This commit is contained in:
Thomas Munro 2022-01-10 23:54:11 +13:00
parent ee41960738
commit f3e78069db
8 changed files with 52 additions and 1 deletions

2
configure vendored
View File

@ -13603,7 +13603,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
fi
for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/uio.h sys/un.h termios.h ucred.h wctype.h
for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/personality.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/uio.h sys/un.h termios.h ucred.h wctype.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

View File

@ -1404,6 +1404,7 @@ AC_CHECK_HEADERS(m4_normalize([
sys/epoll.h
sys/event.h
sys/ipc.h
sys/personality.h
sys/prctl.h
sys/procctl.h
sys/pstat.h

View File

@ -451,6 +451,10 @@ start_postmaster(void)
fflush(stdout);
fflush(stderr);
#ifdef EXEC_BACKEND
pg_disable_aslr();
#endif
pm_pid = fork();
if (pm_pid < 0)
{

View File

@ -25,6 +25,14 @@
#include <sys/wait.h>
#include <unistd.h>
#ifdef EXEC_BACKEND
#if defined(HAVE_SYS_PERSONALITY_H)
#include <sys/personality.h>
#elif defined(HAVE_SYS_PROCCTL_H)
#include <sys/procctl.h>
#endif
#endif
/*
* Hacky solution to allow expressing both frontend and backend error reports
* in one macro call. First argument of log_error is an errcode() call of
@ -470,6 +478,31 @@ set_pglocale_pgservice(const char *argv0, const char *app)
}
}
#ifdef EXEC_BACKEND
/*
* For the benefit of PostgreSQL developers testing EXEC_BACKEND on Unix
* systems (code paths normally exercised only on Windows), provide a way to
* disable address space layout randomization, if we know how on this platform.
* Otherwise, backends may fail to attach to shared memory at the fixed address
* chosen by the postmaster. (See also the macOS-specific hack in
* sysv_shmem.c.)
*/
int
pg_disable_aslr(void)
{
#if defined(HAVE_SYS_PERSONALITY_H)
return personality(ADDR_NO_RANDOMIZE);
#elif defined(HAVE_SYS_PROCCTL_H) && defined(PROC_ASLR_FORCE_DISABLE)
int data = PROC_ASLR_FORCE_DISABLE;
return procctl(P_PID, 0, PROC_ASLR_CTL, &data);
#else
errno = ENOSYS;
return -1;
#endif
}
#endif
#ifdef WIN32
/*

View File

@ -614,6 +614,9 @@
/* Define to 1 if you have the <sys/ipc.h> header file. */
#undef HAVE_SYS_IPC_H
/* Define to 1 if you have the <sys/personality.h> header file. */
#undef HAVE_SYS_PERSONALITY_H
/* Define to 1 if you have the <sys/prctl.h> header file. */
#undef HAVE_SYS_PRCTL_H

View File

@ -140,6 +140,11 @@ extern char *pipe_read_line(char *cmd, char *line, int maxsize);
/* Doesn't belong here, but this is used with find_other_exec(), so... */
#define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
#ifdef EXEC_BACKEND
/* Disable ASLR before exec, for developer builds only (in exec.c) */
extern int pg_disable_aslr(void);
#endif
#if defined(WIN32) || defined(__CYGWIN__)
#define EXE ".exe"

View File

@ -1104,6 +1104,10 @@ spawn_process(const char *cmdline)
if (logfile)
fflush(logfile);
#ifdef EXEC_BACKEND
pg_disable_aslr();
#endif
pid = fork();
if (pid == -1)
{

View File

@ -397,6 +397,7 @@ sub GenerateFiles
HAVE_SYS_EPOLL_H => undef,
HAVE_SYS_EVENT_H => undef,
HAVE_SYS_IPC_H => undef,
HAVE_SYS_PERSONALITY_H => undef,
HAVE_SYS_PRCTL_H => undef,
HAVE_SYS_PROCCTL_H => undef,
HAVE_SYS_PSTAT_H => undef,