diff options
Diffstat (limited to 'libc/sysdeps/linux/common')
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile | 16 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/ssp.c | 33 |
2 files changed, 45 insertions, 4 deletions
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile index 84b29ac53..87791724a 100644 --- a/libc/sysdeps/linux/common/Makefile +++ b/libc/sysdeps/linux/common/Makefile @@ -25,21 +25,31 @@ ifeq ($(strip $(EXCLUDE_BRK)),y) SRCS := $(filter-out sbrk.c,$(SRCS)) endif +SRCS := $(filter-out ssp-local.c,$(SRCS)) ifneq ($(strip $(UCLIBC_HAS_SSP)),y) SRCS := $(filter-out ssp.c,$(SRCS)) +NONSHARED_OBJ_LIST= +else +NONSHARED_OBJ_LIST=../../../nonshared_obj.sysdeps.common endif ssp.o: CFLAGS += $(SSP_DISABLE_FLAGS) +ssp-local.o: CFLAGS += $(SSP_DISABLE_FLAGS) OBJS = $(patsubst %.c,%.o, $(SRCS)) +NONSHARED_OBJS = ssp-local.o + OBJ_LIST=../../../obj.sysdeps.common -all: $(OBJ_LIST) +all: $(OBJ_LIST) $(NONSHARED_OBJ_LIST) $(OBJ_LIST): $(OBJS) echo $(patsubst %, sysdeps/linux/common/%, $(OBJS)) > $(OBJ_LIST) -$(OBJS): %.o : %.c +$(NONSHARED_OBJ_LIST): $(NONSHARED_OBJS) + echo $(patsubst %, sysdeps/linux/common/%, $(NONSHARED_OBJS)) > $(NONSHARED_OBJ_LIST) + +$(OBJS) $(NONSHARED_OBJS): %.o : %.c $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o @@ -47,4 +57,4 @@ headers: $(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h $(TOPDIR)/include/ clean: - $(RM) *.[oa] *~ core + $(RM) *.o *~ core diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c index 899910c96..7791a0104 100644 --- a/libc/sysdeps/linux/common/ssp.c +++ b/libc/sysdeps/linux/common/ssp.c @@ -61,12 +61,43 @@ void __attribute__ ((noreturn)) __stack_smash_handler(char func[], int damaged _ void __attribute__ ((noreturn)) __stack_smash_handler(char func[], int damaged) { extern char *__progname; - const char message[] = ": stack smashing attack in function "; + static const char message[] = ": stack smashing attack in function "; block_signals(); ssp_write(STDERR_FILENO, __progname, message, func); + /* The loop is added only to keep gcc happy. */ + while(1) + terminate(); +} + +void __attribute__ ((noreturn)) __stack_chk_fail(void) +{ + extern char *__progname; + static const char msg1[] = "stack smashing detected: "; + static const char msg3[] = " terminated"; + + block_signals(); + + ssp_write(STDERR_FILENO, msg1, __progname, msg3); + + /* The loop is added only to keep gcc happy. */ + while(1) + terminate(); +} + +void __attribute__ ((noreturn)) __chk_fail(void) +{ + extern char *__progname; + static const char msg1[] = "buffer overflow detected: "; + static const char msg3[] = " terminated"; + + block_signals(); + + ssp_write(STDERR_FILENO, msg1, __progname, msg3); + + /* The loop is added only to keep gcc happy. */ while(1) terminate(); } |