f7f049fa46
* gcc/config/i386/cygwin.h (STARTFILE_SPEC): Add vtv_start.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/mingw32.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (ENDFILE_SPEC): Add vtv_end.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw32.h (ENDFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (LIB_SPEC): Pass -lvtv and -lpsapi,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (LIB_SPEC): Likewise.
* gcc/config/i386/mingw32.h (LIB_SPEC): Likewise.
* gcc/cp/vtable-class-hierarchy.c (vtv_generate_init_routine): Add
check for not TARGET_PECOFF at the VTV_PREINIT_PRIORITY checks.
* gcc/varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section in case the
target is PE or COFF.
* libgcc/Makefile.in: Move rules to build vtv_*.o out of the check
for CUSTOM_CRTSTUFF.
* libgcc/config.host (i[34567]86-*-cygwin*, x86_64-*-cygwin*, i[34567]86-*-mingw*)
(x86_64-*-mingw*): Only add vtv_*.o to extra_parts if enable_vtable_verify.
* libstdc++-v3/acinclude.m4: Define VTV_CYGMIN.
* libstdc++-v3/configure: Regenerate.
* libstdc++-v3/libsupc++/Makefile.am: Add vtv_sources only to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES if VTV_CYGMIN is
not set.
* libstdc++-v3/libsupc++/Makefile.in: Regenerated.
* libstdc++-v3/libsupc++/vtv_stubs.cc: Add none weak declaration of every
function for Cygwin and MinGW.
* libstdc++-v3/src/Makefile.am: Add libvtv.la to toolexeclib_LTLIBRARIES,
if VTV_CYGMIN is set. Define libvtv_la_SOURCES, libvtv_la_LDFLAGS,
libvtv_la_AM_CXXFLAGS and libvtv_la_LINK if VTV_CYGMIN is set.
* libstdc++-v3/src/Makefile.in: Regenerate.
* libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if VTV_CYGMIN
is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS, libvtv_stubs_la_LDFLAGS
and libvtv_stubs_la_SOURCES if VTV_CYGMIN is set. Add obstac.c to
libvtv_la_SOURCES if VTV_CYGMIN is set.
* libvtv/Makefile.in : Regenerate.
* libvtv/aclocal.m4 : Regenerate.
* libvtv/configure : Regenerate.
* libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN.
* libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*, x86_64-*-mingw*)
(i?86-*-mingw*): Add to supported targets.
* libvtv/vtv_fail.cc : Skip inclusion of execinfo.h on Cygwin and MinGW.
(log_error_message): Skip calls to backtrace and backtrace_symbols_fd on Cygwin
and MinGW.
* libvtv/vtv_malloc.cc : Include windows.h and skip sys/mman.h inclusion on
Cygwin and MinGW. Add sysconf port on Cygwin and MinGW.
(obstack_chunk_alloc): Exchange call to mmap with call to VirtualAlloc on Cygwin
and MinGW.
(__vtv_malloc_init): Exchange call to sysconf with call to port of sysconf on
Cygwin and MinGW.
* libvtv/vtv_malloc.h : Declare mprotect and define PROT_READ and PROT_WRITE on
Cygwin and MinGW.
* libvtv/map.h : Include stdint.h on MinGW.
* libvtv/rts.cc : Include windows.h, winternl.h and psapi.h, skip include of
execinfo.h, sys/mman.h and link.h on Cygwin and MinGW.
Add port of __fortify_fail on Cygwin and MinGW.
Change ElfW (Addr) to uintptr_t on Cygwin and MinGW.
(read_section_offset_and_length): Add port for Cygwin and MinGW
(iterate_modules): New function.
(vtv_unprotect_vtable_vars): Use iterate_modules instead of dl_iterate_phdr on
Cygwin and MinGW.
(vtv_protect_vtable_vars): Likewise.
(count_all_pages): Likewise.
(dl_iterate_phdr_count_pages): Don't build on Cygwin and MinGW.
* libvtv/utils.cc : Include windows.h and skip execinfo.h inclusion on
Cygwin and MinGW.
(__vtv_open_log): Exchange call to getuid and getpid with GetCurrentProcessId and
adjust call to snprintf accordingly on Cygwin and MinGW.
Adjust calls to mkdir on MinGW.
Adjust call to open on Cygwin and MinGW.
(__vtv_add_to_log): Adjust call to snprintf on Cygwin and MinGW.
(__vtv_log_verification_failure): Don't generate a backtrace on Cygwin and MinGW.
From-SVN: r220232
106 lines
3.1 KiB
C
106 lines
3.1 KiB
C
// Copyright (C) 2012-2013
|
|
// Free Software Foundation
|
|
//
|
|
// This file is part of GCC.
|
|
//
|
|
// GCC 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, or (at your option)
|
|
// any later version.
|
|
|
|
// GCC 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.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
#ifndef _VTV_MALLOC_H
|
|
#define _VTV_MALLOC_H 1
|
|
|
|
#include <stdlib.h>
|
|
|
|
/* Alignment mask for any object returned by the VTV memory pool */
|
|
#ifdef __LP64__
|
|
#define VTV_ALIGNMENT_MASK (0x7)
|
|
#else
|
|
#define VTV_ALIGNMENT_MASK (0x3)
|
|
#endif
|
|
|
|
/* The following function is used to instrument the compiler and find
|
|
out how many cycles are being spent in various vtable verification
|
|
runtime library functions. */
|
|
|
|
#ifdef __x86_64__
|
|
static inline unsigned long
|
|
rdtsc ()
|
|
{
|
|
unsigned long long hi, lo;
|
|
|
|
asm volatile ("rdtsc" : "=a" (lo), "=d" (hi));
|
|
return hi << 32 | lo;
|
|
}
|
|
#elif defined (__i386__)
|
|
static inline unsigned long long
|
|
rdtsc ()
|
|
{
|
|
unsigned long long var;
|
|
|
|
asm volatile ("rdtsc" : "=A" (var));
|
|
|
|
return var;
|
|
}
|
|
#else
|
|
static inline unsigned long long
|
|
rdtsc ()
|
|
{
|
|
/* Create an empty function for unknown architectures, so that the
|
|
calls to this function in vtv_malloc.cc and vtv_rts.cc do not cause
|
|
compilation errors. */
|
|
return ((unsigned long long) 0);
|
|
}
|
|
#endif
|
|
|
|
|
|
/* The following variables are used only for debugging and performance tuning
|
|
purposes. Therefore they do not need to be "protected". They cannot be used
|
|
to attack the vtable verification system and if they become corrupted it will
|
|
not affect the correctness or security of any of the rest of the vtable
|
|
verification feature. */
|
|
|
|
extern unsigned int num_calls_to_mprotect;
|
|
extern unsigned int num_pages_protected;
|
|
extern unsigned int num_calls_to_regset;
|
|
extern unsigned int num_calls_to_regpair;
|
|
extern unsigned long long mprotect_cycles;
|
|
extern unsigned long long regset_cycles;
|
|
extern unsigned long long regpair_cycles;
|
|
|
|
|
|
/* Function declarations. */
|
|
|
|
extern void __vtv_malloc_init (void);
|
|
extern void *__vtv_malloc (size_t size) __attribute__ ((malloc));
|
|
extern void __vtv_free (void * ptr);
|
|
extern void __vtv_malloc_protect (void);
|
|
extern void __vtv_malloc_unprotect (void);
|
|
extern void __vtv_malloc_stats (void);
|
|
extern void __vtv_malloc_dump_stats (void);
|
|
extern int __vtv_count_mmapped_pages (void);
|
|
|
|
#if defined (__CYGWIN__) || defined (__MINGW32__)
|
|
extern "C" int mprotect (void *addr, int len, int prot);
|
|
|
|
#define PROT_READ 0x1
|
|
#define PROT_WRITE 0x2
|
|
#endif
|
|
|
|
#endif /* vtv_malloc.h */
|