From: Filipe Cabecinhas <me@filcab.net>
Date: Mon, 16 Jul 2018 13:41:54 +0000 (+0000)
Subject: [cfi] Don't pass a uint16_t to memset. Make sure the 16-bit constant is appropriate... 
X-Git-Tag: llvmorg-7.0.0-rc1~1354
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bc3fb477afc2217d1f33f10b914c6e1986c4be7;p=platform%2Fupstream%2Fllvm.git

[cfi] Don't pass a uint16_t to memset. Make sure the 16-bit constant is appropriate for us.

Reviewers: eugenis, pcc, kcc

Subscribers: delcypher, #sanitizers, llvm-commits

Differential Revision: https://reviews.llvm.org/D49252

llvm-svn: 337170
---

diff --git a/compiler-rt/lib/cfi/cfi.cc b/compiler-rt/lib/cfi/cfi.cc
index 52f504b..5ee8365 100644
--- a/compiler-rt/lib/cfi/cfi.cc
+++ b/compiler-rt/lib/cfi/cfi.cc
@@ -132,7 +132,10 @@ void ShadowBuilder::Start() {
 void ShadowBuilder::AddUnchecked(uptr begin, uptr end) {
   uint16_t *shadow_begin = MemToShadow(begin, shadow_);
   uint16_t *shadow_end = MemToShadow(end - 1, shadow_) + 1;
-  memset(shadow_begin, kUncheckedShadow,
+  // memset takes a byte, so our unchecked shadow value requires both bytes to
+  // be the same. Make sure we're ok during compilation.
+  static_assert(kUncheckedShadow & 0xff == ((kUncheckedShadow >> 8) & 0xff));
+  memset(shadow_begin, kUncheckedShadow & 0xff,
          (shadow_end - shadow_begin) * sizeof(*shadow_begin));
 }