Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79962038 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: add support for FORTIFY_SOURCE 



This is the quite trivial backend for s390 which is required to enable
FORTIFY_SOURCE support.

See commit 6974f0c4 ("include/linux/string.h: add the option of
fortified string.h functions") for more details.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 59a19ea9

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ config S390 
	select ARCH_BINFMT_ELF_STATE

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA

	select ARCH_HAS_KCOV

arch/s390/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4 
targets += misc.o piggy.o sizes.h head.o



KBUILD_CFLAGS := -m64 -D__KERNEL__ -O2

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY

KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float

KBUILD_CFLAGS += $(call cc-option,-mpacked-stack)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

arch/s390/include/asm/string.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ extern char *strstr(const char *, const char *); 
#undef __HAVE_ARCH_STRSEP

#undef __HAVE_ARCH_STRSPN



#if !defined(IN_ARCH_STRING_C)

#if !defined(IN_ARCH_STRING_C) && (!defined(CONFIG_FORTIFY_SOURCE) || defined(__NO_FORTIFY))



static inline void *memchr(const void * s, int c, size_t n)

{

arch/s390/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) 
AFLAGS_head.o		+= -march=z900

endif



CFLAGS_als.o		+= -D__NO_FORTIFY



#

# Passing null pointers is ok for smp code, since we access the lowcore here.

#