Commit 6a95a311 authored Feb 22, 2023 by Cui GaoSheng Committed by Jialin Zhang Feb 25, 2023

arm32: kaslr: Avoid using the -fpic and fno-pic parameters together

hulk inclusion
category: bugfix
bugzilla: 188368 https://gitee.com/openeuler/kernel/issues/I6EEK7


CVE: NA

--------------------------------

Avoid using conflicting compilation parameters during compilation,
so we move -fpic from KBUILD_CFLAGS to CFLAGS_KERNEL to avoid
using -fpic and fno-pic parameters together.

Fixes: 6bc05b0a ("arm32: kaslr: Fix the bug of module install failure")
Signed-off-by: Cui GaoSheng <cuigaosheng1@huawei.com>
Reviewed-by: Wang Weiyang <wangweiyang2@huawei.com>
Reviewed-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parent d6331aa1

arch/arm/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,8 @@ KBUILD_LDFLAGS += -EL
		endif

		ifeq ($(CONFIG_RELOCATABLE),y)
		KBUILD_CFLAGS += -fpic -include $(srctree)/include/linux/hidden.h
		KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h
		CFLAGS_KERNEL += -fpic
		CFLAGS_MODULE += -fno-pic
		LDFLAGS_vmlinux += -pie -shared -Bsymbolic
		endif