mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 08:38:45 +02:00 
			
		
		
		
	[PATCH] Add the -fstack-protector option to the CFLAGS
Add a feature check that checks that the gcc compiler has stack-protector support and has the bugfix for PR28281 to make this work in kernel mode. The easiest solution I could find was to have a shell script in scripts/ to do the detection; if needed we can make this fancier in the future without making the makefile too complex. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Andi Kleen <ak@suse.de> CC: Andi Kleen <ak@suse.de> CC: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
		
							parent
							
								
									3162f751d0
								
							
						
					
					
						commit
						4f7fd4d7a7
					
				
					 2 changed files with 9 additions and 0 deletions
				
			
		|  | @ -58,6 +58,9 @@ cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) | |||
| cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | ||||
| AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | ||||
| 
 | ||||
| cflags-$(CONFIG_CC_STACKPROTECTOR) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector ) | ||||
| cflags-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector-all ) | ||||
| 
 | ||||
| CFLAGS += $(cflags-y) | ||||
| CFLAGS_KERNEL += $(cflags-kernel-y) | ||||
| AFLAGS += -m64 | ||||
|  |  | |||
							
								
								
									
										6
									
								
								scripts/gcc-x86_64-has-stack-protector.sh
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/gcc-x86_64-has-stack-protector.sh
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,6 @@ | |||
| #!/bin/sh | ||||
| 
 | ||||
| echo "int foo(void) { char X[200]; return 3; }" | $1 -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs" | ||||
| if [ "$?" -eq "0" ] ; then | ||||
| 	echo $2 | ||||
| fi | ||||
		Loading…
	
		Reference in a new issue
	
	 Arjan van de Ven
						Arjan van de Ven