security_flags.inc: Use SECURITY_X_LDFLAGS for all xf86 modules
PATCH v2 1/1 security_flags.inc: Use SECURITY_X_LDFLAGS for all xf86 modules
We need to ensure that all xorg modules are linked with SECURITY_X_LDFLAGS to ensure that they will be able to resolve their run time dependencies. Update the current list of recipes and add a comment for future reference.
--- meta/conf/distro/include/security_flags.inc | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/conf/distro/include/security_flags.inc +8 -0
@@ -59,6 +59,14 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" +# All xorg module drivers need to be linked this way +SECURITY_LDFLAGS_pn-xf86-input-evdev = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-keyboard = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-libinput = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-mouse = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-synaptics = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-vmmouse = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-video-cirrus = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}"
Signature · 1 line
2.7.4
Quoted 5 lines · Tom Rini
We need to ensure that all xorg modules are linked with
SECURITY_X_LDFLAGSto ensure that they will be able to resolve their run time dependencies. Update the current list of recipes and add a comment for future reference.
LGTM
Quoted 28 lines
Cc Khem Raj <[email protected]>Signed-off-by Tom Rini <[email protected]>--- meta/conf/distro/include/security_flags.inc | 8 ++++++++ 1 file changed, 8 insertions(+)meta/conf/distro/include/security_flags.inc +8
-1@@ -59,6 +59,14 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" +# All xorg module drivers need to be linked this way +SECURITY_LDFLAGS_pn-xf86-input-evdev = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-keyboard = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-libinput = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-mouse = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-synaptics = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-input-vmmouse = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-video-cirrus = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" --2.7.4
PATCH v3 1/1 security_flags.inc, xorg-driver-common.inc: Move SECURITY_X_LDFLAGS logic
In reply to Tom RiniWe need to ensure that all xorg modules are linked with SECURITY_X_LDFLAGS to ensure that they will be able to resolve their run time dependencies. The approach of listing each driver in security_flags.inc lets less frequently used drivers be run-time broken. Move the flag logic into xorg-driver-common.inc so that all xorg modules from all layers will have the correct security flags used.
---
Changes in v3:
- After reviewing fixing the drivers in meta-openembedded/meta-oe if we move this logic into the common xf86 drivers inc file that all layers use to correctly make these drivers, all layers will get this fix for free if we move to overriding there instead. Add a comment to security_flags.inc for future reference.
Changes in v2:
- Oops, can't use % globbing in security_flags.inc, grabs brown paper bag
--- meta/conf/distro/include/security_flags.inc | 8 ++------ meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-)
meta/conf/distro/include/security_flags.inc +2 -6
@@ -59,12 +59,8 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" -SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-omap = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}" +# All xorg module drivers need to be linked this way as well and are +# handled in recipes-graphics/xorg-driver/xorg-driver-common.inc SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" TARGET_CC_ARCH_append_pn-binutils = " ${SELECTED_OPTIMIZATION}"
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +2 -0
@@ -38,3 +38,5 @@ def _add_xorg_abi_depends(d, name): pn = d.getVar("PN") d.appendVar('RDEPENDS_' + pn, ' ' + abi) + +SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}"
Signature · 1 line
2.7.4
Re: [PATCHv3] security_flags.inc, xorg-driver-common.inc: Move SECURITY_X_LDFLAGS logic
Quoted 9 lines · Tom Rini
We need to ensure that all xorg modules are linked with
SECURITY_X_LDFLAGSto ensure that they will be able to resolve their run time dependencies. The approach of listing each driver in security_flags.inc lets less frequently used drivers be run-time broken. Move the flag logic into xorg-driver-common.inc so that all xorg modules from all layers will have the correct security flags used.Cc Khem Raj <[email protected]>Signed-off-by Tom Rini <[email protected]>
Quoted 7 lines
---
Changes in v3:
- After reviewing fixing the drivers in meta-openembedded/meta-oe if we move this logic into the common xf86 drivers inc file that all layers use to correctly make these drivers, all layers will get this fix for free if we move to overriding there instead. Add a comment to security_flags.inc for future reference.
generally, we try to pin this in global inc file so they disappear when someone is
not using this feature. but here I like this approach since it turns into a no-op
if security_flags.inc is not included.
Quoted 40 lines
Changes in v2:
- Oops, can't use % globbing in security_flags.inc, grabs brown paper bag--- meta/conf/distro/include/security_flags.inc | 8 ++------ meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-)meta/conf/distro/include/security_flags.inc +2
-6@@ -59,12 +59,8 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" -SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-omap = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}" -SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}" +# All xorg module drivers need to be linked this way as well and are +# handled in recipes-graphics/xorg-driver/xorg-driver-common.inc SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" TARGET_CC_ARCH_append_pn-binutils = " ${SELECTED_OPTIMIZATION}"meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +2
-1@@ -38,3 +38,5 @@ def _add_xorg_abi_depends(d, name): pn = d.getVar("PN") d.appendVar('RDEPENDS_' + pn, ' ' + abi) + +SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" --2.7.4