Re: [PATCH] s390/decompressor: add fortify_panic as x86 has.

From: Michal SuchÃnek
Date: Wed Dec 20 2017 - 09:10:14 EST


On Wed, 13 Dec 2017 09:33:17 +0100
Heiko Carstens <heiko.carstens@xxxxxxxxxx> wrote:

> From 4ec2a3fd66bb5b1da35807bc2e382f9b8d9eebb8 Mon Sep 17 00:00:00 2001
> From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> Date: Wed, 13 Dec 2017 09:21:59 +0100
> Subject: [PATCH] s390/sclp: disable FORTIFY_SOURCE for early sclp code
>
> Michal Suchanek reported the following compile error with
> FORTIFY_SOURCE enabled:
>
> drivers/s390/char/sclp_early_core.o: In function `memcpy':
> include/linux/string.h:340: undefined reference to `fortify_panic'
>
> To fix this simply disable FORTIFY_SOURCE on the early sclp code as
> well, which I forgot on the initial commit.
>
> Fixes: 79962038dffa ("s390: add support for FORTIFY_SOURCE")
> Reported-by: Michal Suchanek <msuchanek@xxxxxxx>
> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> ---
> drivers/s390/char/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
> index 05ac6ba15a53..614b44e70a28 100644
> --- a/drivers/s390/char/Makefile
> +++ b/drivers/s390/char/Makefile
> @@ -17,6 +17,8 @@ CFLAGS_REMOVE_sclp_early_core.o +=
> $(CC_FLAGS_MARCH) CFLAGS_sclp_early_core.o +=
> -march=z900 endif
>
> +CFLAGS_sclp_early_core.o += -D__NO_FORTIFY
> +
> obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o
> sclp_quiesce.o \ sclp_cmd.o sclp_config.o sclp_cpi_sys.o sclp_ocf.o
> sclp_ctl.o \ sclp_early.o sclp_early_core.o

That works for me as well.

Tested-by: Michal Suchanek <msuchanek@xxxxxxx>

Thanks

Michal