From fb419e813d9cd707e98888cbe1c1d0bd327e72cb Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Wed, 3 Jun 2015 11:09:21 +0530 Subject: [PATCH 51/57] build: introduce security hardening flags in gluster This patch introduces two of the security hardening compiler flags RELRO & PIE in gluster codebase. Using _hardened_build as 1 doesn't guarantee the existance of these flags in the compilation as different versions of RHEL have different redhat-rpm-config macro. So the idea is to export these flags at spec file level. Label: DOWNSTREAM ONLY Change-Id: I0a1a56d0a8f54f110d306ba5e55e39b1b073dc84 BUG: 1200815 Signed-off-by: Atin Mukherjee Reviewed-on: https://code.engineering.redhat.com/gerrit/49780 Reviewed-by: Balamurugan Arumugam Tested-by: Balamurugan Arumugam --- glusterfs.spec.in | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 33d0e7e..3fcc00e 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -612,10 +612,25 @@ This package provides the translators needed on any GlusterFS client. %setup -q -n %{name}-%{version}%{?prereltag} %build -# For whatever reason, install-sh is sometimes missing. When this gets fixed, -# there is no need to run ./autogen or have a BuildRequires for automake. -./autogen.sh -%configure \ +# In RHEL7 few hardening flags are available by default, however the RELRO +# default behaviour is partial, convert to full +%if ( 0%{?rhel} && 0%{?rhel} >= 7 ) +LDFLAGS="$RPM_LD_FLAGS -Wl,-z,relro,-z,now" +export LDFLAGS +%else +%if ( 0%{?rhel} && 0%{?rhel} == 6 ) +CFLAGS="$RPM_OPT_FLAGS -fPIE -DPIE" +LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro,-z,now" +%else +#It appears that with gcc-4.1.2 in RHEL5 there is an issue using both -fPIC and + # -fPIE that makes -z relro not work; -fPIE seems to undo what -fPIC does +CFLAGS="$RPM_OPT_FLAGS" +LDFLAGS="$RPM_LD_FLAGS -Wl,-z,relro,-z,now" +%endif +export CFLAGS +export LDFLAGS +%endif + ./autogen.sh && %configure \ %{?_with_cmocka} \ %{?_with_tmpfilesdir} \ @@ -1735,6 +1750,9 @@ end %endif %changelog +* Thu Jun 11 2015 Atin Mukherjee +- Security hardening flags inclusion (#1200815) + * Wed Jun 10 2015 Niels de Vos - Fix building on RHEL-5 based distributions -- 1.7.1