diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-09 09:23:48 +0100 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-09 09:23:48 +0100 |
| commit | 82098ab9b853c33ee8ade61c9510b295cc696de1 (patch) | |
| tree | 8f4cbadd3425d95002e78cafdbdc0bdf32cedc41 /libc/sysdeps/linux | |
| parent | eb9cca27b385873c6788b18a13d918c873540866 (diff) | |
guard *_chk() related stuff with UCLIBC_HAS_FORTIFY
Guard x86_64 memset_chk/memcpy_chk be guarded by UCLIBC_HAS_FORTIFY.
Compile ssp.c if one of SSP/FORTIFY is defined.
Guard __chk_fail() with UCLIBC_HAS_FORTIFY and move its prototype to libc-internal.h.
Disable _FORTIFY_SOURCE if UCLIBC_HAS_FORTIFY is not set.
The config option itself is omitted on purpose,
headers need to be reviewed and generic *_chk() functions need to be first provided.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Diffstat (limited to 'libc/sysdeps/linux')
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/ssp.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index fd55333fc..3f9791104 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -15,7 +15,7 @@ CSRC_LFS := $(notdir $(wildcard $(COMMON_DIR)/*64.c)) CSRC-y := $(filter-out llseek.c $(CSRC_LFS),$(CSRC-y)) CSRC-$(UCLIBC_HAS_LFS) += llseek.c $(CSRC_LFS) -CSRC-$(UCLIBC_HAS_SSP) += ssp.c +CSRC-$(if $(or $(UCLIBC_HAS_SSP),$(UCLIBC_HAS_FORTIFY)),y) += ssp.c CSRC-$(UCLIBC_LINUX_MODULE_24) += create_module.c query_module.c \ get_kernel_syms.c # we need these internally: fstatfs.c statfs.c diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c index d81c706f4..df242cc69 100644 --- a/libc/sysdeps/linux/common/ssp.c +++ b/libc/sysdeps/linux/common/ssp.c @@ -87,6 +87,7 @@ void __stack_smash_handler(char func[], int damaged) } #endif +#ifdef __UCLIBC_HAS_SSP__ void __stack_chk_fail(void) attribute_noreturn __cold; void __stack_chk_fail(void) { @@ -101,8 +102,9 @@ void __stack_chk_fail(void) while(1) terminate(); } +#endif -void __chk_fail(void) attribute_noreturn; +#ifdef __UCLIBC_HAS_FORTIFY__ void __chk_fail(void) { static const char msg1[] = "buffer overflow detected: "; @@ -116,3 +118,5 @@ void __chk_fail(void) while(1) terminate(); } +libc_hidden_def(__chk_fail) +#endif |