diff options
author | Caroline Tice <ctice@gcc.gnu.org> | 2013-08-06 20:38:59 -0700 |
---|---|---|
committer | Caroline Tice <ctice@gcc.gnu.org> | 2013-08-06 20:38:59 -0700 |
commit | 2077db1be5b18b94a91095a3fb380bbc4a81e61b (patch) | |
tree | 2799c94bc06794956a20aaa9db224f64c5e35e4d /libvtv/scripts/sum-vtv-counts.c | |
parent | 03085d1cf9cc91b1283d7a13343760a526b69282 (diff) | |
download | gcc-2077db1be5b18b94a91095a3fb380bbc4a81e61b.tar.gz |
Commit the vtable verification feature.
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
Diffstat (limited to 'libvtv/scripts/sum-vtv-counts.c')
-rw-r--r-- | libvtv/scripts/sum-vtv-counts.c | 150 |
1 files changed, 150 insertions, 0 deletions
diff --git a/libvtv/scripts/sum-vtv-counts.c b/libvtv/scripts/sum-vtv-counts.c new file mode 100644 index 00000000000..fc99498e705 --- /dev/null +++ b/libvtv/scripts/sum-vtv-counts.c @@ -0,0 +1,150 @@ +/* +This script sums up the counters for seeing how many virtual calls are +actually being verified. The flag for generating the count data is +"-fvtv-counts". This flag will generate two files in /tmp, +"vtv_count_data.log" and "vtv_class_set_sizes.log". The first file is +the one that contains the info I mentioned; the second one is one I +generated because I was curious about how big the average set size was +for the vtable verification work. + +After compiling the attached program, run it on the vtv_count_data.log +file: + +$ sum-counters /tmp/vtv_count_data.log + +One can optionally pass a "--verbose" flag. This file generates an +output file whose name is the same as the input file, with ".summary" +appended to it, e.g. /tmp/vtv_count_data.log.summary . Without the +verbose flag, it will just contain something like this: + +Total # virtual calls: 349123 +Total # verified calls: 348236 +Percent verified: 99 % + +Total calls to __VLTRegisterSet: 42236 +Total calls to __VLTRegisterPair: 84371 +Total # unused vtable map vars: 1536333 + +With the --verbose flag it will also output one line for each +compilation unit for which it verified less than 90% of the virtual +calls (and there were more than 20 virtual calls in the file), +something like this: + +Verified 1 out of 25 (4.00%) : foo.cc +Verified 27 out of 43 (62.00%) : bar.cc +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +void +usage (const char *error_text) +{ + fprintf (stderr, "%s", error_text); + fprintf (stderr, "Usage: \n"); + fprintf (stderr, "sum-counters <input-file> [--verbose]\n"); +} + +int +main (int argc, char **argv) +{ + FILE *fp_in = NULL; + FILE *fp_out = NULL; + int sum_vcalls = 0; + int sum_verified = 0; + int sum_regset = 0; + int sum_regpair = 0; + int sum_unused = 0; + char fname_in[1024]; + char fname_out[1024]; + int total; + int verified; + int regset; + int regpair; + int unused; + float pct; + char buffer[1024]; + int verbose = 0; + + if (argc < 2) + { + usage ("Error: Need an input file.\n"); + return 1; + } + + fp_in = fopen (argv[1], "r"); + if (!fp_in) + { + snprintf (buffer, 1024, "Error: Unable to open input file '%s'.\n", + argv[1]); + usage (buffer); + return 1; + } + + if (argc == 3) + { + if (strcmp (argv[2], "--verbose") == 0) + verbose = 1; + else + { + snprintf (buffer, 1024, "Error: Unrecognized option '%s'.\n", + argv[2]); + usage (buffer); + return 1; + } + } + + snprintf (fname_out, 1024, "%s.summary", argv[1]); + + fp_out = fopen (fname_out, "w"); + if (!fp_out) + { + fprintf (stderr, "Error: Unable to open output file '%s'\n", + fname_out); + return 1; + } + + while (fscanf (fp_in, "%s %d %d %d %d %d\n", fname_in, &total, + &verified, ®set, ®pair, &unused) != EOF) + { + sum_vcalls += total; + sum_verified += verified; + sum_regset += regset; + sum_regpair += regpair; + sum_unused += unused; + + float tmp_pct = 0.0; + + if (total > 0) + tmp_pct = (verified * 100) / total; + + if (verbose && tmp_pct < 90 && total >= 20) + { + fprintf (fp_out, "Verified %d out of %d (%.2f%%) : %s\n", + verified, total, tmp_pct, fname_in); + } + + } + + fclose (fp_in); + + fprintf (fp_out, "\n\n"); + fprintf (fp_out, "Total # virtual calls: %d\n", sum_vcalls); + fprintf (fp_out, "Total # verified calls: %d\n", sum_verified); + if (sum_vcalls > 0) + fprintf (fp_out, "Percent verified: %d %%\n", + sum_verified * 100 / sum_vcalls); + else + fprintf (fp_out, "Percent verified: NA %%\n"); + + fprintf (fp_out, "\nTotal calls to __VLTRegisterSet: %d\n", + sum_regset); + fprintf (fp_out, "Total calls to __VLTRegisterPair: %d\n", + sum_regpair); + fprintf (fp_out, "Total # unused vtable map vars: %d\n", sum_unused); + + fclose (fp_out); + + return 0; +} |