jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

grub2: force -fno-stack-protector in CPPFLAGS

Browse Source 
In commit 2a27294e9ade6130a12ced9a1f152c51431a870e ("grub2: force
-fno-stack-protector in CFLAGS"), a fix was made to the grub2 package
to make it build properly even when SSP support is enabled.

However, commit 20a4583ebf7fe97ea22a1ea11621dd44a8114ca5 ("security
hardening: add RELFO, FORTIFY options") reworked how SSP options are
passed, and they are now passed in CPPFLAGS instead of CFLAGS, making
the fix introduced by 2a27294e9ade6130a12ced9a1f152c51431a870e no
longer operating.

This commit will force no-stack-protector in CPPFLAGS instead of
CFLAGS.

Fixes bug #10961.

Signed-off-by: Tarek El-Sherbiny <tarek_el-sherbiny@waters.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Tarek El-Sherbiny 2018-04-19 09:36:59 +01:00 committed by Thomas Petazzoni
parent 41a7c72c21
commit 523b27afa9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/grub2/grub2.mk
View File

@ -53,8 +53,8 @@ GRUB2_CONF_ENV = \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
CPP="$(HOSTCC) -E" \ CPP="$(HOSTCC) -E" \
TARGET_CC="$(TARGET_CC)" \ TARGET_CC="$(TARGET_CC)" \
TARGET_CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
NM="$(TARGET_NM)" \ NM="$(TARGET_NM)" \
OBJCOPY="$(TARGET_OBJCOPY)" \ OBJCOPY="$(TARGET_OBJCOPY)" \