Skip to content

Commit aa26ee0

Browse files
theunilaanwj
authored andcommitted
release: Add security/export checks to gitian and fix current failures
- fix parsing of BIND_NOW with older readelf - add _IO_stdin_used to ignored exports For details see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634261#109 - add check-symbols and check-security make targets These are not added to the default checks because some of them depend on release-build configs. - always link librt for glibc back-compat builds glibc absorbed clock_gettime in 2.17. librt (its previous location) is safe to link in anyway for back-compat. Fixes #7420 - add security/symbol checks to gitian Github-Pull: #7424 Rebased-From: cd27bf5 475813b f3d3eaf a8ce872 a81c87f
1 parent 568c324 commit aa26ee0

File tree

7 files changed

+34
-7
lines changed

7 files changed

+34
-7
lines changed

Makefile.am

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
2626

2727
DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
2828

29+
BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
30+
$(top_srcdir)/contrib/devtools/security-check.py
31+
2932
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
3033
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
3134
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
@@ -213,7 +216,7 @@ endif
213216

214217
dist_noinst_SCRIPTS = autogen.sh
215218

216-
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
219+
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
217220

218221
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
219222

configure.ac

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ AC_PATH_PROG([GIT], [git])
6464
AC_PATH_PROG(CCACHE,ccache)
6565
AC_PATH_PROG(XGETTEXT,xgettext)
6666
AC_PATH_PROG(HEXDUMP,hexdump)
67+
AC_PATH_TOOL(READELF, readelf)
68+
AC_PATH_TOOL(CPPFILT, c++filt)
6769

6870
dnl pkg-config check.
6971
PKG_PROG_PKG_CONFIG
@@ -409,6 +411,10 @@ AX_GCC_FUNC_ATTRIBUTE([dllimport])
409411

410412
if test x$use_glibc_compat != xno; then
411413

414+
#glibc absorbed clock_gettime in 2.17. librt (its previous location) is safe to link
415+
#in anyway for back-compat.
416+
AC_CHECK_LIB([rt],[clock_gettime],, AC_MSG_ERROR(lib missing))
417+
412418
#__fdelt_chk's params and return type have changed from long unsigned int to long int.
413419
# See which one is present here.
414420
AC_MSG_CHECKING(__fdelt_chk type)
@@ -422,7 +428,8 @@ if test x$use_glibc_compat != xno; then
422428
[ fdelt_type="long int"])
423429
AC_MSG_RESULT($fdelt_type)
424430
AC_DEFINE_UNQUOTED(FDELT_TYPE, $fdelt_type,[parameter and return value type for __fdelt_chk])
425-
431+
else
432+
AC_SEARCH_LIBS([clock_gettime],[rt])
426433
fi
427434

428435
if test x$TARGET_OS != xwindows; then
@@ -489,8 +496,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]],
489496
[ AC_MSG_RESULT(no)]
490497
)
491498

492-
AC_SEARCH_LIBS([clock_gettime],[rt])
493-
494499
AC_MSG_CHECKING([for visibility attribute])
495500
AC_LINK_IFELSE([AC_LANG_SOURCE([
496501
int foo_def( void ) __attribute__((visibility("default")));
@@ -900,6 +905,7 @@ AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
900905
AM_CONDITIONAL([USE_COMPARISON_TOOL],[test x$use_comparison_tool != xno])
901906
AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reorg_test != xno])
902907
AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
908+
AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
903909

904910
AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
905911
AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])

contrib/devtools/security-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def check_ELF_RELRO(executable):
9494
raise IOError('Error opening file')
9595
for line in stdout.split('\n'):
9696
tokens = line.split()
97-
if len(tokens)>1 and tokens[1] == '(BIND_NOW)':
97+
if len(tokens)>1 and tokens[1] == '(BIND_NOW)' or (len(tokens)>2 and tokens[1] == '(FLAGS)' and 'BIND_NOW' in tokens[2]):
9898
have_bindnow = True
9999
return have_gnu_relro and have_bindnow
100100

contrib/devtools/symbol-check.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@
4242
'GLIBCXX': (3,4,13),
4343
'GLIBC': (2,11)
4444
}
45+
# See here for a description of _IO_stdin_used:
46+
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634261#109
47+
4548
# Ignore symbols that are exported as part of every executable
4649
IGNORE_EXPORTS = {
47-
'_edata', '_end', '_init', '__bss_start', '_fini'
50+
'_edata', '_end', '_init', '__bss_start', '_fini', '_IO_stdin_used'
4851
}
4952
READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
5053
CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ script: |
9696
9797
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
9898
make ${MAKEOPTS}
99+
make ${MAKEOPTS} -C src check-security
100+
make ${MAKEOPTS} -C src check-symbols
99101
make install-strip
100102
cd installed
101103
find . -name "lib*.la" -delete

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ script: |
126126
127127
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
128128
make ${MAKEOPTS}
129+
make ${MAKEOPTS} -C src check-security
129130
make deploy
130131
make install-strip
131132
cp -f bitcoin-*setup*.exe $OUTDIR/

src/Makefile.am

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if BUILD_BITCOIN_UTILS
7676
bin_PROGRAMS += bitcoin-cli bitcoin-tx
7777
endif
7878

79-
.PHONY: FORCE
79+
.PHONY: FORCE check-symbols check-security
8080
# bitcoin core #
8181
BITCOIN_CORE_H = \
8282
addrman.h \
@@ -458,6 +458,18 @@ clean-local:
458458
$(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
459459
$(CPPFLAGS) $(AM_CXXFLAGS) $(QT_INCLUDES) $(AM_CXXFLAGS) $(PIE_FLAGS) $(CXXFLAGS) -c -o $@ $<
460460

461+
check-symbols: $(bin_PROGRAMS)
462+
if GLIBC_BACK_COMPAT
463+
@echo "Checking glibc back compat..."
464+
$(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py < $(bin_PROGRAMS)
465+
endif
466+
467+
check-security: $(bin_PROGRAMS)
468+
if HARDEN
469+
@echo "Checking binary security..."
470+
$(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py < $(bin_PROGRAMS)
471+
endif
472+
461473
%.pb.cc %.pb.h: %.proto
462474
@test -f $(PROTOC)
463475
$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)

0 commit comments

Comments
 (0)