commit 296434b5c4fa602710ce542219d9b1f54a220b94
parent 15893bcc5536597ef38262d048d4a0701b91d816
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 20 Oct 2023 16:26:43 +0200
Make generated binaries safer and more robust
Define the CFLAGS_HARDENED and LDFLAGS_HARDENED macros, which list
compiler and linker options that activate various hardening features
aimed at increasing the security and robustness of generated binaries.
The link editor options have all been available since at least ld 2.25.
So you don't have to worry about compatibility issues.
The compiler options are in fact some of those that will be enabled by
the -fhardened option to be introduced in GCC 14. In the following, we
list them and indicate the version of GCC from which they are documented
in the manual, i.e. from which version of GCC they would appear to be
available:
-D_FORTIFY_SOURCE [GCC 5.5]
-fcf-protection options [GCC 8.5]
-fstack-protector-strong [GCC 6.5]
-fstack-clash-protection [GCC 8.5]
-ftrivial-auto-var-init [GCC 12.3]
The latter, -ftrivial-auto-var-init, is too recent. To avoid any
compatibility problems, we haven't activated it yet.
Diffstat:
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ build_library: .config $(DEP)
$(DEP) $(OBJ): config.mk
$(LIBNAME_SHARED): $(OBJ)
- $(CC) -std=c99 $(CFLAGS) $(DPDC_CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(SOFLAGS) $(DPDC_LIBS)
+ $(CC) -std=c99 $(CFLAGS_SO) $(DPDC_CFLAGS) -o $@ $(OBJ) $(LDFLAGS_SO) $(DPDC_LIBS)
$(LIBNAME_STATIC): libs2d.o
$(AR) -rc $@ $?
@@ -67,10 +67,10 @@ libs2d.o: $(OBJ)
.SUFFIXES: .c .d .o
.c.d:
- @$(CC) -std=c99 $(CFLAGS) $(DPDC_CFLAGS) -MM -MT "$(@:.d=.o) $@" $< -MF $@
+ @$(CC) -std=c99 $(CFLAGS_SO) $(DPDC_CFLAGS) -MM -MT "$(@:.d=.o) $@" $< -MF $@
.c.o:
- $(CC) -std=c99 $(CFLAGS) $(DPDC_CFLAGS) -DS2D_SHARED_BUILD -c $< -o $@
+ $(CC) -std=c99 $(CFLAGS_SO) $(DPDC_CFLAGS) -DS2D_SHARED_BUILD -c $< -o $@
################################################################################
# Installation
@@ -157,10 +157,11 @@ clean_test:
@$(SHELL) make.sh clean_test $(TEST_SRC)
$(TEST_DEP): config.mk s2d-local.pc
- @$(CC) -std=c89 $(CFLAGS) $(S2D_CFLAGS) -MM -MT "$(@:.d=.o) $@" $(@:.d=.c) -MF $@
+ @$(CC) -std=c89 $(CFLAGS_EXE) $(S2D_CFLAGS) \
+ -MM -MT "$(@:.d=.o) $@" $(@:.d=.c) -MF $@
$(TEST_OBJ): config.mk s2d-local.pc
- $(CC) -std=c89 $(CFLAGS) $(S2D_CFLAGS) -c $(@:.o=.c) -o $@
+ $(CC) -std=c89 $(CFLAGS_EXE) $(S2D_CFLAGS) -c $(@:.o=.c) -o $@
test_s2d_closest_point \
test_s2d_device \
@@ -174,4 +175,4 @@ test_s2d_scene_view2 \
test_s2d_trace_ray \
test_s2d_trace_ray_3d \
: config.mk s2d-local.pc
- $(CC) -o $@ src/$@.o $(LDFLAGS) $(S2D_LIBS) -lm
+ $(CC) -std=c89 $(CFLAGS_EXE) -o $@ src/$@.o $(LDFLAGS_EXE) $(S2D_LIBS) -lm
diff --git a/config.mk b/config.mk
@@ -47,26 +47,37 @@ WFLAGS =\
-Wmissing-prototypes\
-Wshadow
+CFLAGS_HARDENED =\
+ -D_FORTIFY_SOURCES=2\
+ -fcf-protection=full\
+ -fstack-clash-protection\
+ -fstack-protector-strong
+
CFLAGS_COMMON =\
-pedantic\
- -fPIC\
-fvisibility=hidden\
-fstrict-aliasing\
+ $(CFLAGS_HARDENED)\
$(WFLAGS)
-CFLAGS_RELEASE = -O2 -DNDEBUG $(CFLAGS_COMMON)
CFLAGS_DEBUG = -g $(CFLAGS_COMMON)
+CFLAGS_RELEASE = -O2 -DNDEBUG $(CFLAGS_COMMON)
CFLAGS = $(CFLAGS_$(BUILD_TYPE))
+CFLAGS_SO = $(CFLAGS) -fPIC
+CFLAGS_EXE = $(CFLAGS) -fPIE
+
################################################################################
# Linker options
################################################################################
-SOFLAGS = -shared -Wl,--no-undefined
-
-LDFLAGS_DEBUG =
-LDFLAGS_RELEASE = -s
+LDFLAGS_HARDENED = -Wl,-z,relro,-z,now
+LDFLAGS_DEBUG = $(LDFLAGS_HARDENED)
+LDFLAGS_RELEASE = -s $(LDFLAGS_HARDENED)
LDFLAGS = $(LDFLAGS_$(BUILD_TYPE))
+LDFLAGS_SO = $(LDFLAGS) -shared -Wl,--no-undefined
+LDFLAGS_EXE = $(LDFLAGS) -pie
+
OCPFLAGS_DEBUG = --localize-hidden
OCPFLAGS_RELEASE = --localize-hidden --strip-unneeded
OCPFLAGS = $(OCPFLAGS_$(BUILD_TYPE))
