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
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
|
From 0fb2f3573cbe92216e7f56f2ac8b22e4427671ee Mon Sep 17 00:00:00 2001
From: Ruben Ayrapetyan <r.ayrapetyan@samsung.com>
Date: Wed, 5 Apr 2017 21:08:32 +0300
Subject: [PATCH 02/32] Direct mapping of IL-assembly images that don't contain
writeable sections.
---
src/inc/pedecoder.h | 2 +
src/utilcode/pedecoder.cpp | 31 ++++++++++++++++
src/vm/pefile.cpp | 15 +++++++-
src/vm/peimage.cpp | 92 ++++++++++++++++++++++++++++++++++++++--------
src/vm/peimage.h | 2 +-
5 files changed, 124 insertions(+), 18 deletions(-)
diff --git a/src/inc/pedecoder.h b/src/inc/pedecoder.h
index d5bae87..01375e6 100644
--- a/src/inc/pedecoder.h
+++ b/src/inc/pedecoder.h
@@ -187,6 +187,8 @@ class PEDecoder
DWORD GetImageIdentity() const;
+ BOOL HasWriteableSections() const;
+
// Directory entry access
BOOL HasDirectoryEntry(int entry) const;
diff --git a/src/utilcode/pedecoder.cpp b/src/utilcode/pedecoder.cpp
index 3b3c937..babe374 100644
--- a/src/utilcode/pedecoder.cpp
+++ b/src/utilcode/pedecoder.cpp
@@ -440,6 +440,37 @@ CHECK PEDecoder::CheckSection(COUNT_T previousAddressEnd, COUNT_T addressStart,
CHECK_OK;
}
+BOOL PEDecoder::HasWriteableSections() const
+{
+ CONTRACT_CHECK
+ {
+ INSTANCE_CHECK;
+ PRECONDITION(CheckFormat());
+ NOTHROW;
+ GC_NOTRIGGER;
+ SUPPORTS_DAC;
+ SO_TOLERANT;
+ }
+ CONTRACT_CHECK_END;
+
+ PTR_IMAGE_SECTION_HEADER pSection = FindFirstSection(FindNTHeaders());
+ _ASSERTE(pSection != NULL);
+
+ PTR_IMAGE_SECTION_HEADER pSectionEnd = pSection + VAL16(FindNTHeaders()->FileHeader.NumberOfSections);
+
+ while (pSection < pSectionEnd)
+ {
+ if ((pSection->Characteristics & VAL32(IMAGE_SCN_MEM_WRITE)) != 0)
+ {
+ return TRUE;
+ }
+
+ pSection++;
+ }
+
+ return FALSE;
+}
+
CHECK PEDecoder::CheckDirectoryEntry(int entry, int forbiddenFlags, IsNullOK ok) const
{
CONTRACT_CHECK
diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp
index c7870e6..0c4f660 100644
--- a/src/vm/pefile.cpp
+++ b/src/vm/pefile.cpp
@@ -376,9 +376,22 @@ void PEFile::LoadLibrary(BOOL allowNativeSkip/*=TRUE*/) // if allowNativeSkip==F
#endif
{
if (GetILimage()->IsFile())
- GetILimage()->LoadFromMapped();
+ {
+#ifdef PLATFORM_UNIX
+ if (GetILimage()->IsILOnly())
+ {
+ GetILimage()->Load();
+ }
+ else
+#endif // PLATFORM_UNIX
+ {
+ GetILimage()->LoadFromMapped();
+ }
+ }
else
+ {
GetILimage()->LoadNoFile();
+ }
}
}
diff --git a/src/vm/peimage.cpp b/src/vm/peimage.cpp
index 1462c94..bd5ad7f 100644
--- a/src/vm/peimage.cpp
+++ b/src/vm/peimage.cpp
@@ -909,13 +909,36 @@ PTR_PEImageLayout PEImage::GetLayoutInternal(DWORD imageLayoutMask,DWORD flags)
{
_ASSERTE(HasID());
- if (imageLayoutMask&PEImageLayout::LAYOUT_MAPPED)
+ BOOL bIsMappedLayoutSuitable = ((imageLayoutMask & PEImageLayout::LAYOUT_MAPPED) != 0);
+ BOOL bIsFlatLayoutSuitable = ((imageLayoutMask & PEImageLayout::LAYOUT_FLAT) != 0);
+
+#if !defined(PLATFORM_UNIX)
+ if (bIsMappedLayoutSuitable)
{
- pRetVal = PEImage::CreateLayoutMapped();
+ bIsFlatLayoutSuitable = FALSE;
}
- else
+#endif // !PLATFORM_UNIX
+
+ _ASSERTE(bIsMappedLayoutSuitable || bIsFlatLayoutSuitable);
+
+ BOOL bIsMappedLayoutRequired = !bIsFlatLayoutSuitable;
+ BOOL bIsFlatLayoutRequired = !bIsMappedLayoutSuitable;
+
+ if (bIsFlatLayoutRequired
+ || (bIsFlatLayoutSuitable && !m_bIsTrustedNativeImage))
{
- pRetVal = PEImage::CreateLayoutFlat();
+ _ASSERTE(bIsFlatLayoutSuitable);
+
+ BOOL bPermitWriteableSections = bIsFlatLayoutRequired;
+
+ pRetVal = PEImage::CreateLayoutFlat(bPermitWriteableSections);
+ }
+
+ if (pRetVal == NULL)
+ {
+ _ASSERTE(bIsMappedLayoutSuitable);
+
+ pRetVal = PEImage::CreateLayoutMapped();
}
}
@@ -992,7 +1015,7 @@ PTR_PEImageLayout PEImage::CreateLayoutMapped()
return pRetVal;
}
-PTR_PEImageLayout PEImage::CreateLayoutFlat()
+PTR_PEImageLayout PEImage::CreateLayoutFlat(BOOL bPermitWriteableSections)
{
CONTRACTL
{
@@ -1002,12 +1025,22 @@ PTR_PEImageLayout PEImage::CreateLayoutFlat()
}
CONTRACTL_END;
- PTR_PEImageLayout pRetVal;
+ _ASSERTE(m_pLayouts[IMAGE_FLAT] == NULL);
- pRetVal = PEImageLayout::LoadFlat(GetFileHandle(),this);
- m_pLayouts[IMAGE_FLAT] = pRetVal;
+ PTR_PEImageLayout pFlatLayout = PEImageLayout::LoadFlat(GetFileHandle(),this);
- return pRetVal;
+ if (!bPermitWriteableSections && pFlatLayout->HasWriteableSections())
+ {
+ pFlatLayout->Release();
+
+ return NULL;
+ }
+ else
+ {
+ m_pLayouts[IMAGE_FLAT] = pFlatLayout;
+
+ return pFlatLayout;
+ }
}
/* static */
@@ -1070,17 +1103,44 @@ void PEImage::Load()
}
SimpleWriteLockHolder lock(m_pLayoutLock);
- if(!IsFile())
+
+ _ASSERTE(m_pLayouts[IMAGE_LOADED] == NULL);
+
+#ifdef PLATFORM_UNIX
+ if (m_pLayouts[IMAGE_FLAT] != NULL
+ && m_pLayouts[IMAGE_FLAT]->CheckFormat()
+ && m_pLayouts[IMAGE_FLAT]->IsILOnly()
+ && !m_pLayouts[IMAGE_FLAT]->HasWriteableSections())
{
- if (!m_pLayouts[IMAGE_FLAT]->CheckILOnly())
- ThrowHR(COR_E_BADIMAGEFORMAT);
- if(m_pLayouts[IMAGE_LOADED]==NULL)
- SetLayout(IMAGE_LOADED,PEImageLayout::LoadFromFlat(m_pLayouts[IMAGE_FLAT]));
+ // IL-only images with writeable sections are mapped in general way,
+ // because the writeable sections should always be page-aligned
+ // to make possible setting another protection bits exactly for these sections
+ _ASSERTE(!m_pLayouts[IMAGE_FLAT]->HasWriteableSections());
+
+ // As the image is IL-only, there should no be native code to execute
+ _ASSERTE(!m_pLayouts[IMAGE_FLAT]->HasNativeEntryPoint());
+
+ m_pLayouts[IMAGE_FLAT]->AddRef();
+
+ SetLayout(IMAGE_LOADED, m_pLayouts[IMAGE_FLAT]);
}
else
+#endif // PLATFORM_UNIX
{
- if(m_pLayouts[IMAGE_LOADED]==NULL)
- SetLayout(IMAGE_LOADED,PEImageLayout::Load(this,TRUE));
+ if(!IsFile())
+ {
+ _ASSERTE(m_pLayouts[IMAGE_FLAT] != NULL);
+
+ if (!m_pLayouts[IMAGE_FLAT]->CheckILOnly())
+ ThrowHR(COR_E_BADIMAGEFORMAT);
+ if(m_pLayouts[IMAGE_LOADED]==NULL)
+ SetLayout(IMAGE_LOADED,PEImageLayout::LoadFromFlat(m_pLayouts[IMAGE_FLAT]));
+ }
+ else
+ {
+ if(m_pLayouts[IMAGE_LOADED]==NULL)
+ SetLayout(IMAGE_LOADED,PEImageLayout::Load(this,TRUE));
+ }
}
}
diff --git a/src/vm/peimage.h b/src/vm/peimage.h
index f61e185..e77a474 100644
--- a/src/vm/peimage.h
+++ b/src/vm/peimage.h
@@ -262,7 +262,7 @@ private:
PTR_PEImageLayout CreateLayoutMapped();
// Create the flat layout
- PTR_PEImageLayout CreateLayoutFlat();
+ PTR_PEImageLayout CreateLayoutFlat(BOOL bPermitWriteableSections);
#endif
// Get an existing layout corresponding to the mask, no AddRef
PTR_PEImageLayout GetExistingLayoutInternal(DWORD imageLayoutMask);
--
2.7.4
|
