diff options
author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-08-23 12:11:00 +0000 |
---|---|---|
committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-08-23 12:11:00 +0000 |
commit | 7c7b8e57f8f3d20610cdbf1888e2f0101752f986 (patch) | |
tree | 13f24a5d34d64194aa750cca2186c399d5c768c1 /lib/Transforms/Instrumentation | |
parent | a0b2d332c114571716746ba90c815cfb6f68d4ab (diff) | |
download | llvm-7c7b8e57f8f3d20610cdbf1888e2f0101752f986.tar.gz llvm-7c7b8e57f8f3d20610cdbf1888e2f0101752f986.tar.bz2 llvm-7c7b8e57f8f3d20610cdbf1888e2f0101752f986.tar.xz |
[msan] Fix handling of va_arg overflow area on x86_64.
The code was erroneously reading overflow area shadow from the TLS slot,
bypassing the local copy. Reading shadow directly from TLS is wrong, because
it can be overwritten by a nested vararg call, if that happens before va_start.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189104 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Instrumentation')
-rw-r--r-- | lib/Transforms/Instrumentation/MemorySanitizer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp index a78213de7b..ae73a2e9c9 100644 --- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -1970,8 +1970,7 @@ struct VarArgAMD64Helper : public VarArgHelper { Value *OverflowArgAreaPtr = IRB.CreateLoad(OverflowArgAreaPtrPtr); Value *OverflowArgAreaShadowPtr = MSV.getShadowPtr(OverflowArgAreaPtr, IRB.getInt8Ty(), IRB); - Value *SrcPtr = - getShadowPtrForVAArgument(VAArgTLSCopy, IRB, AMD64FpEndOffset); + Value *SrcPtr = IRB.CreateConstGEP1_32(VAArgTLSCopy, AMD64FpEndOffset); IRB.CreateMemCpy(OverflowArgAreaShadowPtr, SrcPtr, VAArgOverflowSize, 16); } } |