diff --git a/kexec-tools-2.0.3-ppc-exec-stack-fix.patch b/kexec-tools-2.0.3-ppc-exec-stack-fix.patch new file mode 100644 index 0000000..0d578fb --- /dev/null +++ b/kexec-tools-2.0.3-ppc-exec-stack-fix.patch @@ -0,0 +1,35 @@ +Subject: [PATCH] ppc: exec stack fix + +execstack shows ppc kexec has an executable stack, +this leaves it vulnerable to buffer overflows. + +Fix it by adding ASFLAGS --noexecstack + +Tested on PowerMac G4 Macmini: +Without the patch: +dave@darkstar:~/kexec-tools$ execstack build/sbin/kexec +X build/sbin/kexec + +With the patch: +dave@darkstar:~/kexec-tools$ execstack build/sbin/kexec +- build/sbin/kexec + +Signed-off-by: Dave Young +Signed-off-by: Simon Horman +--- + kexec/arch/ppc/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +Index: kexec-tools-2.0.3/kexec/arch/ppc/Makefile +=================================================================== +--- kexec-tools-2.0.3.orig/kexec/arch/ppc/Makefile ++++ kexec-tools-2.0.3/kexec/arch/ppc/Makefile +@@ -23,6 +23,8 @@ CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH) + + ppc_KEXEC_SRCS += $(libfdt_SRCS) + ++ASFLAGS += -Wa,--noexecstack ++ + dist += kexec/arch/ppc/Makefile $(ppc_KEXEC_SRCS) \ + kexec/arch/ppc/crashdump-powerpc.h kexec/arch/ppc/fixup_dtb.h \ + kexec/arch/ppc/kexec-ppc.h kexec/arch/ppc/ops.h \ diff --git a/kexec-tools.spec b/kexec-tools.spec index 60a5289..4bb64fd 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -72,6 +72,7 @@ Patch301: kexec-tools-2.0.3-ppc-ppc64-compile-purgatory-code-with-gcc-option-mso # # Patches 501 through 600 are meant for ppc kexec-tools enablement # +Patch501: kexec-tools-2.0.3-ppc-exec-stack-fix.patch # # Patches 601 onward are generic patches @@ -97,6 +98,7 @@ tar -z -x -v -f %{SOURCE9} %patch001 -p1 %patch002 -p1 %patch301 -p1 +%patch501 -p1 %patch601 -p1 %patch602 -p1 %patch603 -p1