summaryrefslogtreecommitdiffstats
path: root/MdePkg/Library
diff options
context:
space:
mode:
authorAndrew Fish <afish@apple.com>2014-08-21 09:23:58 +0000
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-21 09:23:58 +0000
commit66c6d4d67ed870e9135c05a1f4deb03843c9faec (patch)
tree2db510ae63dbc6e2ccf162f566da41e8b9984be7 /MdePkg/Library
parent0923aa1c3ad1a68f4781a98897889f3976d1b83d (diff)
downloadedk2-66c6d4d67ed870e9135c05a1f4deb03843c9faec.tar.gz
edk2-66c6d4d67ed870e9135c05a1f4deb03843c9faec.tar.bz2
edk2-66c6d4d67ed870e9135c05a1f4deb03843c9faec.zip
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
Diffstat (limited to 'MdePkg/Library')
-rw-r--r--MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c2
-rw-r--r--MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf1
2 files changed, 1 insertions, 2 deletions
diff --git a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c
index ecf77f0739..4cd0d4ce30 100644
--- a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c
+++ b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c
@@ -23,7 +23,7 @@
#include <Library/PcdLib.h>
/// "canary" value that is inserted by the compiler into the stack frame.
-VOID *__stack_chk_guard = (VOID*)FixedPcdGet64 (PcdBaseStackCanary);
+VOID *__stack_chk_guard = (VOID*)0x0AFF;
// If ASLR was enabled we could use
//void (*__stack_chk_guard)(void) = __stack_chk_fail;
diff --git a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
index 3304284ecb..1f33d5b211 100644
--- a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
+++ b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
@@ -38,5 +38,4 @@
DebugLib
[FixedPcd]
- gEfiMdePkgTokenSpaceGuid.PcdBaseStackCanary
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask