1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
#!/bin/bash
set -e -v -x
mkdir -p $UPLOAD_DIR
cd $MOZ_FETCHES_DIR/winchecksec
SUFFIX=
case "$1" in
x86_64-pc-windows-msvc)
SUFFIX=.exe
export PATH="$MOZ_FETCHES_DIR/clang/bin:$PATH"
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
# Patch pe-parse because clang-cl doesn't support /analyze.
patch -p1 <<'EOF'
--- a/pe-parse/cmake/compilation_flags.cmake
+++ b/pe-parse/cmake/compilation_flags.cmake
@@ -1,5 +1,5 @@
if (MSVC)
- list(APPEND DEFAULT_CXX_FLAGS /W4 /analyze)
+ list(APPEND DEFAULT_CXX_FLAGS /W4)
if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
list(APPEND DEFAULT_CXX_FLAGS /Zi)
EOF
CMAKE_FLAGS='
-DCMAKE_CXX_COMPILER=clang-cl
-DCMAKE_C_COMPILER=clang-cl
-DCMAKE_LINKER=lld-link
-DCMAKE_C_FLAGS="-fuse-ld=lld -Xclang -ivfsoverlay -Xclang $MOZ_FETCHES_DIR/vs/overlay.yaml"
-DCMAKE_CXX_FLAGS="-fuse-ld=lld -EHsc -Xclang -ivfsoverlay -Xclang $MOZ_FETCHES_DIR/vs/overlay.yaml"
-DCMAKE_RC_COMPILER=llvm-rc
-DCMAKE_MT=llvm-mt
-DCMAKE_SYSTEM_NAME=Windows
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
'
;;
esac
# Apply https://github.com/trailofbits/pe-parse/commit/d9e72af81e832330c111e07b98d34877469445f5
# And https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c
patch -p1 <<'EOF'
--- a/pe-parse/pe-parser-library/src/buffer.cpp
+++ b/pe-parse/pe-parser-library/src/buffer.cpp
@@ -112,11 +112,12 @@ bool readWord(bounded_buffer *b, std::uint32_t offset, std::uint16_t &out) {
return false;
}
- std::uint16_t *tmp = reinterpret_cast<std::uint16_t *>(b->buf + offset);
+ std::uint16_t tmp;
+ memcpy(&tmp, (b->buf + offset), sizeof(std::uint16_t));
if (b->swapBytes) {
- out = byteSwapUint16(*tmp);
+ out = byteSwapUint16(tmp);
} else {
- out = *tmp;
+ out = tmp;
}
return true;
@@ -133,11 +134,12 @@ bool readDword(bounded_buffer *b, std::uint32_t offset, std::uint32_t &out) {
return false;
}
- std::uint32_t *tmp = reinterpret_cast<std::uint32_t *>(b->buf + offset);
+ std::uint32_t tmp;
+ memcpy(&tmp, (b->buf + offset), sizeof(std::uint32_t));
if (b->swapBytes) {
- out = byteSwapUint32(*tmp);
+ out = byteSwapUint32(tmp);
} else {
- out = *tmp;
+ out = tmp;
}
return true;
@@ -154,11 +156,12 @@ bool readQword(bounded_buffer *b, std::uint32_t offset, std::uint64_t &out) {
return false;
}
- std::uint64_t *tmp = reinterpret_cast<std::uint64_t *>(b->buf + offset);
+ std::uint64_t tmp;
+ memcpy(&tmp, (b->buf + offset), sizeof(std::uint64_t));
if (b->swapBytes) {
- out = byteSwapUint64(*tmp);
+ out = byteSwapUint64(tmp);
} else {
- out = *tmp;
+ out = tmp;
}
return true;
@@ -175,16 +178,16 @@ bool readChar16(bounded_buffer *b, std::uint32_t offset, char16_t &out) {
return false;
}
- char16_t *tmp = nullptr;
+ char16_t tmp;
if (b->swapBytes) {
std::uint8_t tmpBuf[2];
tmpBuf[0] = *(b->buf + offset + 1);
tmpBuf[1] = *(b->buf + offset);
- tmp = reinterpret_cast<char16_t *>(tmpBuf);
+ memcpy(&tmp, tmpBuf, sizeof(std::uint16_t));
} else {
- tmp = reinterpret_cast<char16_t *>(b->buf + offset);
+ memcpy(&tmp, (b->buf + offset), sizeof(std::uint16_t));
}
- out = *tmp;
+ out = tmp;
return true;
}
--- a/pe-parse/pe-parser-library/include/parser-library/parse.h
+++ b/pe-parse/pe-parser-library/include/parser-library/parse.h
@@ -40,28 +40,38 @@ THE SOFTWARE.
err_loc.assign(__func__); \
err_loc += ":" + to_string<std::uint32_t>(__LINE__, std::dec);
-#define READ_WORD(b, o, inst, member) \
- if (!readWord(b, o + _offset(__typeof__(inst), member), inst.member)) { \
- PE_ERR(PEERR_READ); \
- return false; \
+#define READ_WORD(b, o, inst, member) \
+ if (!readWord(b, \
+ o + static_cast<uint32_t>(offsetof(__typeof__(inst), member)), \
+ inst.member)) { \
+ PE_ERR(PEERR_READ); \
+ return false; \
}
-#define READ_DWORD(b, o, inst, member) \
- if (!readDword(b, o + _offset(__typeof__(inst), member), inst.member)) { \
- PE_ERR(PEERR_READ); \
- return false; \
+#define READ_DWORD(b, o, inst, member) \
+ if (!readDword( \
+ b, \
+ o + static_cast<uint32_t>(offsetof(__typeof__(inst), member)), \
+ inst.member)) { \
+ PE_ERR(PEERR_READ); \
+ return false; \
}
-#define READ_QWORD(b, o, inst, member) \
- if (!readQword(b, o + _offset(__typeof__(inst), member), inst.member)) { \
- PE_ERR(PEERR_READ); \
- return false; \
+#define READ_QWORD(b, o, inst, member) \
+ if (!readQword( \
+ b, \
+ o + static_cast<uint32_t>(offsetof(__typeof__(inst), member)), \
+ inst.member)) { \
+ PE_ERR(PEERR_READ); \
+ return false; \
}
-#define READ_BYTE(b, o, inst, member) \
- if (!readByte(b, o + _offset(__typeof__(inst), member), inst.member)) { \
- PE_ERR(PEERR_READ); \
- return false; \
+#define READ_BYTE(b, o, inst, member) \
+ if (!readByte(b, \
+ o + static_cast<uint32_t>(offsetof(__typeof__(inst), member)), \
+ inst.member)) { \
+ PE_ERR(PEERR_READ); \
+ return false; \
}
#define TEST_MACHINE_CHARACTERISTICS(h, m, ch) \
--- a/pe-parse/pe-parser-library/src/parse.cpp
+++ b/pe-parse/pe-parser-library/src/parse.cpp
@@ -1777,7 +1777,7 @@ bool getRelocations(parsed_pe *p) {
// Mask out the type and assign
type = entry >> 12;
// Mask out the offset and assign
- offset = entry & ~0xf000;
+ offset = entry & static_cast<std::uint16_t>(~0xf000);
// Produce the VA of the relocation
VA relocVA;
EOF
eval cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=Off \
$CMAKE_FLAGS
ninja -v
cd ..
tar -caf winchecksec.tar.zst winchecksec/winchecksec${SUFFIX}
cp winchecksec.tar.zst $UPLOAD_DIR/
|
