MdePkg: Introduced BaseStackCheckLib (cont.)

Liming proposed different changes compare to the latest patch.
This commit ensures the changes goes in his direction.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <afish@apple.com>
Signed-off-by: Olivier Martin <olivier.martin@arm.com
Reviewed-by: Gao, Liming <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15866 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c
index ecf77f07392cf69c756b59416813b5b38c92ece6..4cd0d4ce30f8dd87feaeedf546324339019b028f 100644 (file)
--- a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c
+++ b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c
@@ -23,7 +23,7 @@
 #include <Library/PcdLib.h>\r
 \r
 /// "canary" value that is inserted by the compiler into the stack frame.\r
-VOID *__stack_chk_guard = (VOID*)FixedPcdGet64 (PcdBaseStackCanary);\r
+VOID *__stack_chk_guard = (VOID*)0x0AFF;\r
 \r
 // If ASLR was enabled we could use\r
 //void (*__stack_chk_guard)(void) = __stack_chk_fail;\r

diff --git a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
index 3304284ecb0754d51e3f988483c196932271dd37..1f33d5b2119e45978978c4eeaa3de252f701cae8 100644 (file)
--- a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
+++ b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
@@ -38,5 +38,4 @@
   DebugLib\r
 \r
 [FixedPcd]\r
-  gEfiMdePkgTokenSpaceGuid.PcdBaseStackCanary\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 743e7bdba828eaf4c6d76e09e3f0b563f786ed43..bd5ce07269ef402bce77ac44ea3f0926f6fb0514 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -1553,10 +1553,6 @@
   #  The required memory space is decided by the value of PcdMaximumGuidedExtractHandler.\r
   gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|0x1000000|UINT64|0x30001015\r
 \r
-  ## Canary value for the stack overflow protection. This PCD can be used by a firmware vendor\r
-  # or for debugging purposes to change the recommended value.\r
-  gEfiMdePkgTokenSpaceGuid.PcdBaseStackCanary|0x0AFF|UINT64|0x0000002A\r
-\r
 [PcdsFixedAtBuild.IPF]\r
   ## The base address of IO port space for IA64 arch\r
   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000|UINT64|0x0000000f\r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 9532c1ec1ea69fddc1439a1394f75c4ef3173b38..8971d762a902fc58e9851551fe5b2b85ab25f599 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -169,3 +169,6 @@
   \r
 [Components.EBC]\r
   MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
+\r
+[Components.ARM, Components.AARCH64]\r
+  MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf\r