diff options
Diffstat (limited to 'lib/dfsan/scripts')
| -rwxr-xr-x | lib/dfsan/scripts/build-libc-list.py | 36 | ||||
| -rwxr-xr-x | lib/dfsan/scripts/check_custom_wrappers.sh | 50 |
2 files changed, 74 insertions, 12 deletions
diff --git a/lib/dfsan/scripts/build-libc-list.py b/lib/dfsan/scripts/build-libc-list.py index 8f6b8d5136317..eddb6c07e99d8 100755 --- a/lib/dfsan/scripts/build-libc-list.py +++ b/lib/dfsan/scripts/build-libc-list.py @@ -26,27 +26,38 @@ def defined_function_list(object): raise subprocess.CalledProcessError(readelf_proc.returncode, 'readelf') for line in readelf: if (line[31:35] == 'FUNC' or line[31:36] == 'IFUNC') and \ + line[39:44] != 'LOCAL' and \ line[55:58] != 'UND': function_name = line[59:].split('@')[0] functions.append(function_name) return functions p = OptionParser() -p.add_option('--lib', metavar='PATH', - help='path to lib directory to use', + +p.add_option('--libc-dso-path', metavar='PATH', + help='path to libc DSO directory', default='/lib/x86_64-linux-gnu') -p.add_option('--usrlib', metavar='PATH', - help='path to usr/lib directory to use', +p.add_option('--libc-archive-path', metavar='PATH', + help='path to libc archive directory', default='/usr/lib/x86_64-linux-gnu') -p.add_option('--gcclib', metavar='PATH', - help='path to gcc lib directory to use', + +p.add_option('--libgcc-dso-path', metavar='PATH', + help='path to libgcc DSO directory', + default='/lib/x86_64-linux-gnu') +p.add_option('--libgcc-archive-path', metavar='PATH', + help='path to libgcc archive directory', default='/usr/lib/gcc/x86_64-linux-gnu/4.6') + p.add_option('--with-libstdcxx', action='store_true', dest='with_libstdcxx', help='include libstdc++ in the list (inadvisable)') +p.add_option('--libstdcxx-dso-path', metavar='PATH', + help='path to libstdc++ DSO directory', + default='/usr/lib/x86_64-linux-gnu') + (options, args) = p.parse_args() -libs = [os.path.join(options.lib, name) for name in +libs = [os.path.join(options.libc_dso_path, name) for name in ['ld-linux-x86-64.so.2', 'libanl.so.1', 'libBrokenLocale.so.1', @@ -61,14 +72,15 @@ libs = [os.path.join(options.lib, name) for name in 'librt.so.1', 'libthread_db.so.1', 'libutil.so.1']] -libs += [os.path.join(options.usrlib, name) for name in +libs += [os.path.join(options.libc_archive_path, name) for name in ['libc_nonshared.a', 'libpthread_nonshared.a']] -gcclibs = ['libgcc.a', - 'libgcc_s.so'] + +libs.append(os.path.join(options.libgcc_dso_path, 'libgcc_s.so.1')) +libs.append(os.path.join(options.libgcc_archive_path, 'libgcc.a')) + if options.with_libstdcxx: - gcclibs += ['libstdc++.so'] -libs += [os.path.join(options.gcclib, name) for name in gcclibs] + libs.append(os.path.join(options.libstdcxx_dso_path, 'libstdc++.so.6')) functions = [] for l in libs: diff --git a/lib/dfsan/scripts/check_custom_wrappers.sh b/lib/dfsan/scripts/check_custom_wrappers.sh new file mode 100755 index 0000000000000..50bc85d4aef5d --- /dev/null +++ b/lib/dfsan/scripts/check_custom_wrappers.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +DFSAN_DIR=$(dirname "$0")/../ +DFSAN_CUSTOM_TESTS=${DFSAN_DIR}/../../test/dfsan/custom.cc +DFSAN_CUSTOM_WRAPPERS=${DFSAN_DIR}/dfsan_custom.cc +DFSAN_ABI_LIST=${DFSAN_DIR}/done_abilist.txt + +DIFFOUT=$(mktemp -q /tmp/tmp.XXXXXXXXXX) +ERRORLOG=$(mktemp -q /tmp/tmp.XXXXXXXXXX) +DIFF_A=$(mktemp -q /tmp/tmp.XXXXXXXXXX) +DIFF_B=$(mktemp -q /tmp/tmp.XXXXXXXXXX) + +on_exit() { + rm -f ${DIFFOUT} 2> /dev/null + rm -f ${ERRORLOG} 2> /dev/null + rm -f ${DIFF_A} 2> /dev/null + rm -f ${DIFF_B} 2> /dev/null +} + +trap on_exit EXIT +grep -E "^fun:.*=custom" ${DFSAN_ABI_LIST} | grep -v "dfsan_get_label" \ + | sed "s/^fun:\(.*\)=custom.*/\1/" | sort > $DIFF_A +grep -E "__dfsw.*\(" ${DFSAN_CUSTOM_WRAPPERS} \ + | sed "s/.*__dfsw_\(.*\)(.*/\1/" | sort > $DIFF_B +diff -u $DIFF_A $DIFF_B > ${DIFFOUT} +if [ $? -ne 0 ] +then + echo -n "The following differences between the ABI list and ">> ${ERRORLOG} + echo "the implemented custom wrappers have been found:" >> ${ERRORLOG} + cat ${DIFFOUT} >> ${ERRORLOG} +fi + +grep -E __dfsw_ ${DFSAN_CUSTOM_WRAPPERS} \ + | sed "s/.*__dfsw_\([^(]*\).*/\1/" | sort > $DIFF_A +grep -E "^\\s*test_.*\(\);" ${DFSAN_CUSTOM_TESTS} \ + | sed "s/.*test_\(.*\)();/\1/" | sort > $DIFF_B +diff -u $DIFF_A $DIFF_B > ${DIFFOUT} +if [ $? -ne 0 ] +then + echo -n "The following differences between the implemented " >> ${ERRORLOG} + echo "custom wrappers and the tests have been found:" >> ${ERRORLOG} + cat ${DIFFOUT} >> ${ERRORLOG} +fi + +if [ -s ${ERRORLOG} ] +then + cat ${ERRORLOG} + exit 1 +fi + |