mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [to-be-updated] makefile-introduce-config_cc_stackprotector_auto-fix-3.patch removed from -mm tree
@ 2017-10-17 19:57 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2017-10-17 19:57 UTC (permalink / raw)
  To: keescook, robert.jarzmik, mm-commits


The patch titled
     Subject: Makefile: fix empty flag results for stackprotector _AUTO mode
has been removed from the -mm tree.  Its filename was
     makefile-introduce-config_cc_stackprotector_auto-fix-3.patch

This patch was dropped because an updated version will be merged

------------------------------------------------------
From: Kees Cook <keescook@chromium.org>
Subject: Makefile: fix empty flag results for stackprotector _AUTO mode

If the compiler didn't support any stackprotector mode, the second empty
test would still trip.  This moves it to an "else" test for the non-AUTO
modes.

Link: http://lkml.kernel.org/r/20171016040333.GA82643@beast
Signed-off-by: Kees Cook <keescook@chromium.org>
Reported-by: Robert Jarzmik <robert.jarzmik@free.fr>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Makefile |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff -puN Makefile~makefile-introduce-config_cc_stackprotector_auto-fix-3 Makefile
--- a/Makefile~makefile-introduce-config_cc_stackprotector_auto-fix-3
+++ a/Makefile
@@ -1097,16 +1097,17 @@ PHONY += prepare-compiler-check
 prepare-compiler-check: FORCE
 # Make sure compiler supports requested stack protector flag.
 ifdef stackp-name
-  # Warn about CONFIG_CC_STACKPROTECTOR_AUTO having found no option.
   ifeq ($(stackp-flag),)
+	# Warn about CONFIG_CC_STACKPROTECTOR_AUTO having found no option.
 	@echo CONFIG_CC_STACKPROTECTOR_$(stackp-name): \
 		  Compiler does not support any known stack-protector >&2
-  endif
-  # Fail if specifically requested stack protector is missing.
+  else
   ifeq ($(call cc-option, $(stackp-flag)),)
+	# Fail if specifically requested stack protector is missing.
 	@echo Cannot use CONFIG_CC_STACKPROTECTOR_$(stackp-name): \
 		  $(stackp-flag) not supported by compiler >&2 && exit 1
   endif
+  endif
 endif
 # Make sure compiler does not have buggy stack-protector support.
 ifdef stackp-check
_

Patches currently in -mm which might be from keescook@chromium.org are

writeback-convert-timers-to-use-timer_setup.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-10-17 19:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-17 19:57 [to-be-updated] makefile-introduce-config_cc_stackprotector_auto-fix-3.patch removed from -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).