2077db1be5
Commit the vtable verification feature. This feature is designed to detect, at run time, if/when the vtable pointer in a C++ object has been corrupted, before allowing virtual calls through that pointer. If pointer corruption is detected, execution of the program is halted. libstdc++-v3 ChangeLog: 2013-08-06 Caroline Tice <cmtice@google.com> * fragment.am: Add XTEMPLATE_FLAGS. * configure.ac: Add definitions for --enable-vtable-verify. * acinclude.m4: Add --enable-vtable-verify and --disable-vtable-verify; define --enable-vtable-verify; define VTV_CXXFLAGS, VTV_PCH_CXXFLAGS and VTV_CXXLINKFLAGS. * config/abi/pre/gnu.ver: Export symbols for vtable verification. * libsupc++/Makefile.am: Define vtv_sources and add it to libsupc___la_SOURCES and libsupc__convenience_la_SOURCES. * libsupc++/vtv_stubs.cc: New file. * include/Makefile.am: Add VTV_PCH_CXXFLAGS to PCHFLAGS. * src/Makefile.am: Add VTV_CXXFLAGS to AM_CXXFLAGS; add VTV_CXXLINKFLAGS to CXXLINK. * src/c++98/Makefile.am: Comment out XTEMPLATE_FLAGS; add VTV_CXXFLAGS to AM_CXXFLAGS; add VTV_CXXXLINKFLAGS to CXXLINK. * src/C++11/Makefile.am: Ditto. * doc/xml/manual/configure.xml: Add entry for --enable-vtable-verify. * scripts/testsuite_flags.in: Add cxxvtvflags to Usage; cause cxxvtvflags to use VTV_CXXFLAGS and VTV_CXXLINKFLAGS. * testsuite/lib/libstdc++.exp: Add cxxvtvflags; add code to locate libvtv if --enable-vtable-verify was used; set cxxvtvflags; add cxxvtvflags to cxx_final. * testsuite/18_support/bad_exception/23591_thread-1.c: Add -fvtable-verify=none to compiler flags. * testsuite/17_intro/freestanding.cc: Add -fvtable-verify=none to compiler flags. * configure: Regenerated. * Makefile.in: Regenerated. * python/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * libsupc++/Makefile.in: Regenerated. * config.h.in: Regenerated. * po/Makefile.in: Regenerated. * src/Makefile.in: Regenerated. * src/c++98/Makefile.in: Regenerated. * src/c++11/Makefile.in: Regenerated. * doc/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. top level ChangeLog: 2013-08-06 Caroline Tice <cmtice@google.com> * configure.ac: Add target-libvtv to target_libraries; disable libvtv on non-linux systems; add target-libvtv to noconfigdirs; add libsupc++/.libs to C++ library search paths. * configure: Regenerated. * Makefile.def: Add libvtv to target_modules; make libvtv depend on libstdc++ and libgcc. * Makefile.in: Regenerated. include/ChangeLog: 2013-08-06 Caroline Tice <cmtice@google.com> * vtv-change-permission.h: New file. contrib/ChangeLog: 2013-08-06 Caroline Tice4 <cmtice@google.com> * gcc_update: Add libvtv files. libgcc/ChangeLog: 2013-08-06 Caroline Tice <cmtice@google.com> config.host (extra_parts): Add vtv_start.o, vtv_end.o vtv_start_preinit.o and vtv_end_preinit.o. configure.ac: Add code to check/set enable_vtable_verify. Makefile.in: Add rules to build vtv_*.o, if enable_vtable_verify is true. vtv_start_preinit.c: New file. vtv_end_preinit.c: New file. vtv_start.c: New file. vtv_end.c: New file. configure: Regenerated. gcc/ChangeLog: 2013-08-06 Caroline Tice <cmtice@google.com> * gcc.c (VTABLE_VERIFICATION_SPEC): New definition. (LINK_COMMAND_SPEC): Add VTABLE_VERIFICATION_SPEC. * tree-pass.h: Add pass_vtable_verify. * varasm.c (assemble_variable): Add code to properly set the comdat section and name for the .vtable_map_vars section. (assemble_vtyv_preinit_initializer): New function. (default_sectin_type_flags): Make sure .vtable_map_vars section has LINK_ONCE flag. * output.h: Add function decl for assemble_vtv_preinit_initializer. * vtable-verify.c: New file. * vtable-verify.h: New file. * flag-types.h (enum vtv_priority): Defintions for flag_vtable_verify initialiation levels. * timevar.def (TV_VTABLE_VERIFICATION): New definition. * passes.def: Insert pass_vtable_verify. * aclocal.m4: Reorder includes. * doc/invoke.texi: Add documentation for the flags -fvtable-verify=, -fvtv-debug and -fvtv-counts. * config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Add vtv_start*.o, as appropriate, if -fvtable-verify=... is used. (GNU_USER_TARGET_ENDFILE_SPEC): Add vtv_end*.o as appropriate, if -fvtable-verify=... is used. * Makefile.in (OBJS): Add vtable-verify.o to list. (vtable-verify.o): Add new build rule. (GTFILES): Add vtable-verify.c to list. * common.opt (fvtable-verify=): New flag. (vtv_priority): Values for fvtable-verify= flag. (fvtv-counts): New flag. (fvtv-debug): New flag. * tree.h (save_vtable_map_decl): New extern function decl. gcc/cp/ChangeLog: 2013-08-06 Caroline Tice <cmtice@google.com> * Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to list. (vtable-class-hierarchy.o): Add build rule. * cp-tree.h (vtv_start_verification_constructor_init_function): New extern function decl. (vtv_finish_verification_constructor_init_function): New extern function decl. (build_vtbl_address): New extern function decl. (get_mangled_vtable_map_var_name): New extern function decl. (vtv_compute_class_hierarchy_transitive_closure): New extern function decl. (vtv_generate_init_routine): New extern function decl. (vtv_save_class_info): New extern function decl. (vtv_recover_class_info): New extern function decl. (vtv_build_vtable_verify_fndecl): New extern function decl. * class.c (finish_struct_1): Add call to vtv_save_class_info if flag_vtable_verify is true. * config-lang.in: Add vtable-class-hierarchy.c to gtfiles list. * vtable-class-hierarchy.c: New file. * mangle.c (get_mangled_vtable_map_var_name): New function. * decl2.c (start_objects): Update function comment. (cp_write_global_declarations): Call vtv_recover_class_info, vtv_compute_class_hierarchy_transitive_closure and vtv_build_vtable_verify_fndecl, before calling finalize_compilation_unit, and call vtv_generate_init_rount after, IFF flag_vtable_verify is true. (vtv_start_verification_constructor_init_function): New function. (vtv_finish_verification_constructor_init_function): New function. * init.c (build_vtbl_address): Remove static qualifier from function. libvtv/ChangeLog: 2013-08-06 Caroline Tice <cmtice@google.com> Initial check-in of new vtable verification feature. * configure.ac : New file. * acinclude.m4 : New file. * Makefile.am : New file. * aclocal.m4 : New file. * configure.tgt : New file. * configure: New file (generated). * Makefile.in: New file (generated). * vtv_set.h : New file. * vtv_utils.cc : New file. * vtv_utils.h : New file. * vtv_malloc.cc : New file. * vtv_rts.cc : New file. * vtv_malloc.h : New file. * vtv_rts.h : New file. * vtv_fail.cc : New file. * vtv_fail.h : New file. * vtv_map.h : New file. * scripts/run-testsuite.sh : New file. * scripts/sum-vtv-counts.c : New file. * testsuite/parts-test-main.h : New file. * testusite/dataentry.cc : New file. * testsuite/temp_deriv.cc : New file. * testsuite/register_pair.cc : New file. * testsuite/virtual_inheritance.cc : New file. * testsuite/field-test.cc : New file. * testsuite/nested_vcall_test.cc : New file. * testsuite/template-list-iostream.cc : New file. * testsuite/register_pair_inserts.cc : New file. * testsuite/register_pair_inserts_mt.cc : New file. * testsuite/event.list : New file. * testsuite/parts-test-extra-parts-views.cc : New file. * testsuite/parts-test-extra-parts-views.h : New file. * testsuite/environment-fail-32.s : New file. * testsuite/parts-test-extra-parts.h : New file. * testsuite/temp_deriv2.cc : New file. * testsuite/dlopen_mt.cc : New file. * testsuite/event.h : New file. * testsuite/template-list.cc : New file. * testsuite/replace-fail.cc : New file. * testsuite/Makefile.am : New file. * testsuite/Makefile.in: New file (generated). * testsuite/mempool_negative.c : New file. * testsuite/parts-test-main.cc : New file. * testsuite/event-private.cc : New file. * testsuite/thunk.cc : New file. * testsuite/event-defintiions.cc : New file. * testsuite/event-private.h : New file. * testsuite/parts-test.list : New file. * testusite/register_pair_mt.cc : New file. * testsuite/povray-derived.cc : New file. * testsuite/event-main.cc : New file. * testsuite/environment.cc : New file. * testsuite/template-list2.cc : New file. * testsuite/thunk_vtable_map_attack.cc : New file. * testsuite/parts-test-extra-parts.cc : New file. * testsuite/environment-fail-64.s : New file. * testsuite/dlopen.cc : New file. * testsuite/so.cc : New file. * testsuite/temp_deriv3.cc : New file. * testsuite/const_vtable.cc : New file. * testsuite/mempool_positive.c : New file. * testsuite/dup_name.cc : New file. From-SVN: r201555
312 lines
9.9 KiB
C++
312 lines
9.9 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_MAP_H
|
|
#define _VTV_MAP_H 1
|
|
|
|
#include <string.h>
|
|
#include <vtv_utils.h>
|
|
|
|
inline uint64_t
|
|
load8bytes (const void *p)
|
|
{
|
|
uint64_t result;
|
|
memcpy (&result, p, 8);
|
|
return result;
|
|
}
|
|
|
|
/* Insert_only_hash_map maps keys to values. The implementation is a
|
|
basic hash table with open addressing. The keys are not "owned" by
|
|
the table; it only stores pointers to keys. The key type is
|
|
specified below (see insert_only_hash_map::key_type) and is,
|
|
roughly speaking, a string of any length with the string length and
|
|
a hash code stored at the front. The code here does not compute
|
|
any hash codes, but rather uses what's given. */
|
|
|
|
template<typename T, typename Alloc>
|
|
class insert_only_hash_map
|
|
{
|
|
public:
|
|
typedef size_t size_type;
|
|
typedef T value_type;
|
|
typedef Alloc alloc_type;
|
|
enum { min_capacity = 4 };
|
|
#if HASHMAP_STATS
|
|
enum { stats = true };
|
|
#else
|
|
enum { stats = false };
|
|
#endif
|
|
|
|
/* Keys are a byte string (up to 2^32 - 1 long) plus a uint32_t
|
|
that's used as a hash code. The latter can encode arbitrary
|
|
information at the client's discretion, so, e.g., multiple keys
|
|
that are the same string still "differ" if the hash codes differ.
|
|
Keys are equal if the first 8 bytes are equal and the next n
|
|
bytes are equal. */
|
|
struct key_type
|
|
{
|
|
uint32_t n;
|
|
uint32_t hash;
|
|
char bytes[0];
|
|
|
|
bool
|
|
equals (const key_type *k) const;
|
|
};
|
|
|
|
/* Create an empty map with a reasonable number of buckets for the
|
|
expected size. Returns NULL if the allocator fails. */
|
|
|
|
static insert_only_hash_map *
|
|
create (size_type expected_size);
|
|
|
|
/* The opposite of create(). Free the memory for the given map. */
|
|
|
|
static void
|
|
destroy (insert_only_hash_map *m)
|
|
{ Alloc().dealloc (m, m->size_in_bytes_); }
|
|
|
|
/* Return a map identical to this except that *k is mapped to v.
|
|
Typcially it's done by modifying this in place, but if a resize
|
|
is necessary then this is deallocated and a new map is returned.
|
|
Requires k to be non-NULL. Does nothing and returns NULL if the
|
|
allocator fails. */
|
|
|
|
insert_only_hash_map*
|
|
put (const key_type *k, const value_type &v)
|
|
{ return this->put_internal (k, v, false); }
|
|
|
|
/* If *k is a key in this then set *v to point to the corresponding
|
|
value. Otherwise, do the equivalent of insert(k, value_type())
|
|
and, if that succeeds, set *v to point to the inserted value.
|
|
Requires k to be non-NULL. Does nothing and returns NULL if the
|
|
allocator fails. Typically returns this, but will return a new
|
|
insert_only_hash_map if a resize occurs. If the return value is
|
|
non-NULL, *v is set and it's valid until a resize of the map that
|
|
is the return value. */
|
|
|
|
insert_only_hash_map *
|
|
find_or_add_key (const key_type *k, value_type **v);
|
|
|
|
/* Get the value corresponding to *k. Returns NULL if there is
|
|
none. Requires k to be non-NULL. The return value is valid
|
|
until any resize. */
|
|
const value_type *get (const key_type *k) const;
|
|
|
|
size_type
|
|
size () const
|
|
{ return num_entries_; }
|
|
|
|
bool
|
|
empty () const
|
|
{ return this->size () == 0; }
|
|
|
|
size_type
|
|
bucket_count () const
|
|
{ return num_buckets_; }
|
|
|
|
private:
|
|
typedef std::pair <const key_type *, value_type> bucket_type;
|
|
|
|
insert_only_hash_map *put_internal (const key_type *, const value_type &,
|
|
bool);
|
|
|
|
/* This function determines when to resize the table. */
|
|
bool
|
|
is_too_full (size_type entries) const
|
|
{ return entries > (this->bucket_count () * 0.7); }
|
|
|
|
/* Return a copy with double the number of buckets. Returns NULL if
|
|
the allocator fails. Otherwise, calls destroy (this). */
|
|
insert_only_hash_map *destructive_copy ();
|
|
|
|
/* Must be a power of 2 not less than min_capacity. */
|
|
size_type num_buckets_;
|
|
size_type num_entries_;
|
|
size_type size_in_bytes_;
|
|
bucket_type buckets[0]; /* Actual array size is num_buckets. */
|
|
};
|
|
|
|
template <typename T, typename Alloc>
|
|
insert_only_hash_map <T, Alloc> *
|
|
insert_only_hash_map <T, Alloc>::create (size_type expected_size)
|
|
{
|
|
size_t cap = min_capacity;
|
|
while (expected_size >= cap)
|
|
{
|
|
cap *= 2;
|
|
}
|
|
size_t size_in_bytes = sizeof (insert_only_hash_map <T, Alloc>)
|
|
+ cap * sizeof (bucket_type);
|
|
insert_only_hash_map <T, Alloc>* result =
|
|
static_cast <insert_only_hash_map <T, Alloc>*> (Alloc ()
|
|
.alloc (size_in_bytes));
|
|
if (result != NULL)
|
|
{
|
|
result->size_in_bytes_ = size_in_bytes;
|
|
result->num_buckets_ = cap;
|
|
result->num_entries_ = 0;
|
|
memset (result->buckets, 0, cap * sizeof (bucket_type));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
template <typename T, typename Alloc>
|
|
insert_only_hash_map <T, Alloc>*
|
|
insert_only_hash_map <T, Alloc>::destructive_copy ()
|
|
{
|
|
insert_only_hash_map* copy = create (this->bucket_count ());
|
|
if (copy == NULL)
|
|
return NULL;
|
|
VTV_DEBUG_ASSERT (copy->bucket_count () == 2 * this->bucket_count ());
|
|
for (size_type i = 0; i < this->bucket_count (); i++)
|
|
if (this->buckets[i].first != NULL)
|
|
copy->put_internal (this->buckets[i].first, this->buckets[i].second,
|
|
true);
|
|
VTV_DEBUG_ASSERT (copy->size () == this->size ());
|
|
destroy (this);
|
|
return copy;
|
|
}
|
|
|
|
template <typename T, typename Alloc>
|
|
insert_only_hash_map <T, Alloc>*
|
|
insert_only_hash_map <T, Alloc>::find_or_add_key (const key_type *k,
|
|
value_type **v)
|
|
{
|
|
/* Table size is always a power of 2. */
|
|
const size_type mask = this->bucket_count () - 1;
|
|
size_type bucket_index = k->hash & mask;
|
|
size_type step = 1;
|
|
for (;;)
|
|
{
|
|
bucket_type &bucket = this->buckets[bucket_index];
|
|
if (bucket.first == NULL)
|
|
{
|
|
/* Key was not present. */
|
|
if (this->is_too_full (this->size () + 1))
|
|
{
|
|
insert_only_hash_map <T, Alloc>* result =
|
|
this->destructive_copy ();
|
|
return result == NULL
|
|
? NULL
|
|
: result->find_or_add_key (k, v);
|
|
}
|
|
else
|
|
{
|
|
bucket.first = k;
|
|
bucket.second = T ();
|
|
this->num_entries_++;
|
|
*v = &bucket.second;
|
|
return this;
|
|
}
|
|
}
|
|
else if (bucket.first->equals (k))
|
|
{
|
|
/* Key was present. */
|
|
*v = &bucket.second;
|
|
return this;
|
|
}
|
|
else
|
|
bucket_index = (bucket_index + step++) & mask;
|
|
}
|
|
}
|
|
|
|
template <typename T, typename Alloc>
|
|
insert_only_hash_map <T, Alloc>*
|
|
insert_only_hash_map <T, Alloc>::put_internal (
|
|
const insert_only_hash_map::key_type *k,
|
|
const insert_only_hash_map::value_type &v,
|
|
bool unique_key_and_resize_not_needed)
|
|
{
|
|
/* Table size is always a power of 2. */
|
|
const size_type mask = this->bucket_count () - 1;
|
|
size_type bucket_index = k->hash & mask;
|
|
size_type step = 1;
|
|
for (;;)
|
|
{
|
|
bucket_type &bucket = this->buckets[bucket_index];
|
|
if (bucket.first == NULL)
|
|
{
|
|
/* Key was not present. */
|
|
if (!unique_key_and_resize_not_needed
|
|
&& this->is_too_full (this->size () + 1))
|
|
{
|
|
insert_only_hash_map <T, Alloc>* result =
|
|
this->destructive_copy ();
|
|
return result == NULL
|
|
? NULL
|
|
: result->put_internal (k, v, true);
|
|
}
|
|
else
|
|
{
|
|
bucket.first = k;
|
|
bucket.second = v;
|
|
this->num_entries_++;
|
|
return this;
|
|
}
|
|
}
|
|
else if (!unique_key_and_resize_not_needed && bucket.first->equals (k))
|
|
{
|
|
/* Key was present. Just change the value. */
|
|
bucket.second = v;
|
|
return this;
|
|
}
|
|
else
|
|
bucket_index = (bucket_index + step++) & mask;
|
|
}
|
|
}
|
|
|
|
template <typename T, typename Alloc>
|
|
inline const typename insert_only_hash_map <T, Alloc>::value_type*
|
|
insert_only_hash_map <T, Alloc>::get (const insert_only_hash_map::key_type *k)
|
|
const
|
|
{
|
|
/* Table size is always a power of 2. */
|
|
const size_type mask = this->bucket_count () - 1;
|
|
size_type bucket_index = k->hash & mask;
|
|
size_type step = 1;
|
|
for (;;)
|
|
{
|
|
const bucket_type &bucket = this->buckets[bucket_index];
|
|
if (bucket.first == NULL)
|
|
return NULL;
|
|
else if (bucket.first->equals (k))
|
|
return &bucket.second;
|
|
else
|
|
bucket_index = (bucket_index + step++) & mask;
|
|
}
|
|
}
|
|
|
|
template <typename T, typename Alloc>
|
|
inline bool
|
|
insert_only_hash_map <T, Alloc>::key_type::equals (
|
|
const typename insert_only_hash_map <T, Alloc>::key_type *k) const
|
|
{
|
|
const char* x = reinterpret_cast <const char *> (k);
|
|
const char* y = reinterpret_cast <const char *> (this);
|
|
return (load8bytes (x) == load8bytes (y)
|
|
&& memcmp (x + 8, y + 8, this->n) == 0);
|
|
}
|
|
|
|
#endif /* _VTV_MAP_H */
|