mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 0a114b5e07eb (bug 1588245) on suspicion of crashing Firefox on startup (bug 1670546 etc.) a=backout

This commit is contained in:
Andreea Pavel 2020-10-12 14:31:40 +03:00
Родитель d25eb00ab4
Коммит e921b46c56
5 изменённых файлов: 24 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

37
mozglue/misc/interceptor/MMPolicies.h
Просмотреть файл

@ -150,18 +150,6 @@ class MOZ_TRIVIAL_CTOR_DTOR MMPolicyBase {
}
public:
#if defined(NIGHTLY_BUILD)
Maybe<DetourError> mLastError;
const Maybe<DetourError>& GetLastError() const { return mLastError; }
template <typename... Args>
void SetLastError(Args&&... aArgs) {
mLastError = Some(DetourError(std::forward<Args>(aArgs)...));
}
#else
template <typename... Args>
void SetLastError(Args&&... aArgs) {}
#endif // defined(NIGHTLY_BUILD)
DWORD ComputeAllocationSize(const uint32_t aRequestedSize) const {
MOZ_ASSERT(aRequestedSize);
DWORD result = aRequestedSize;
@ -309,17 +297,15 @@ class MOZ_TRIVIAL_CTOR_DTOR MMPolicyBase {
* large.
*/
PVOID FindRegion(HANDLE aProcess, const size_t aDesiredBytesLen,
const uint8_t* aRangeMin, const uint8_t* aRangeMax) {
const uint8_t* aRangeMin, const uint8_t* aRangeMax) const {
const DWORD kGranularity = GetAllocGranularity();
MOZ_ASSERT(aDesiredBytesLen >= kGranularity);
if (!aDesiredBytesLen) {
SetLastError(MMPOLICY_RESERVE_FINDREGION_INVALIDLEN);
return nullptr;
}
MOZ_ASSERT(aRangeMin < aRangeMax);
if (aRangeMin >= aRangeMax) {
SetLastError(MMPOLICY_RESERVE_FINDREGION_INVALIDRANGE);
return nullptr;
}
@ -355,8 +341,6 @@ class MOZ_TRIVIAL_CTOR_DTOR MMPolicyBase {
reinterpret_cast<const uint8_t*>(mbi.BaseAddress) + mbi.RegionSize;
}
SetLastError(MMPOLICY_RESERVE_FINDREGION_VIRTUALQUERY_ERROR,
::GetLastError());
return nullptr;
}
@ -379,14 +363,10 @@ class MOZ_TRIVIAL_CTOR_DTOR MMPolicyBase {
PVOID Reserve(HANDLE aProcess, const uint32_t aSize,
const ReserveFnT& aReserveFn,
const ReserveRangeFnT& aReserveRangeFn,
const Maybe<Span<const uint8_t>>& aBounds) {
const Maybe<Span<const uint8_t>>& aBounds) const {
if (!aBounds) {
// No restrictions, let the OS choose the base address
PVOID ret = aReserveFn(aProcess, nullptr, aSize);
if (!ret) {
SetLastError(MMPOLICY_RESERVE_NOBOUND_RESERVE_ERROR, ::GetLastError());
}
return ret;
return aReserveFn(aProcess, nullptr, aSize);
}
const uint8_t* lowerBound = GetLowerBound(aBounds.ref());
@ -424,11 +404,8 @@ class MOZ_TRIVIAL_CTOR_DTOR MMPolicyBase {
// If we run out of attempts, we fall through to the default case where
// the system chooses any base address it wants. In that case, the hook
// will be set on a best-effort basis.
PVOID ret = aReserveFn(aProcess, nullptr, aSize);
if (!ret) {
SetLastError(MMPOLICY_RESERVE_FINAL_RESERVE_ERROR, ::GetLastError());
}
return ret;
return aReserveFn(aProcess, nullptr, aSize);
}
};
@ -825,13 +802,11 @@ class MMPolicyOutOfProcess : public MMPolicyBase {
uint32_t Reserve(const uint32_t aSize,
const Maybe<Span<const uint8_t>>& aBounds) {
if (!aSize || !mProcess) {
SetLastError(MMPOLICY_RESERVE_INVALIDARG);
return 0;
}
if (mRemoteView) {
MOZ_ASSERT(mReservationSize >= aSize);
SetLastError(MMPOLICY_RESERVE_ZERO_RESERVATIONSIZE);
return mReservationSize;
}
@ -841,14 +816,12 @@ class MMPolicyOutOfProcess : public MMPolicyBase {
PAGE_EXECUTE_READWRITE | SEC_RESERVE, 0,
mReservationSize, nullptr);
if (!mMapping) {
SetLastError(MMPOLICY_RESERVE_CREATEFILEMAPPING, ::GetLastError());
return 0;
}
mLocalView = static_cast<uint8_t*>(
::MapViewOfFile(mMapping, FILE_MAP_WRITE, 0, 0, 0));
if (!mLocalView) {
SetLastError(MMPOLICY_RESERVE_MAPVIEWOFFILE, ::GetLastError());
return 0;
}

10
mozglue/misc/interceptor/PatcherBase.h
Просмотреть файл

@ -121,16 +121,6 @@ class WindowsDllPatcherBase {
return mVMPolicy.IsPageAccessible(aAddress);
}
#if defined(NIGHTLY_BUILD)
const Maybe<DetourError>& GetLastError() const {
return mVMPolicy.GetLastError();
}
#endif // defined(NIGHTLY_BUILD)
template <typename... Args>
void SetLastError(Args&&... aArgs) {
mVMPolicy.SetLastError(std::forward<Args>(aArgs)...);
}
protected:
VMPolicy mVMPolicy;
};

24
mozglue/misc/interceptor/PatcherDetour.h
Просмотреть файл

@ -128,6 +128,10 @@ class WindowsDllDetourPatcher final
using PrimitiveT = WindowsDllDetourPatcherPrimitive<MMPolicyT>;
Maybe<DetourFlags> mFlags;
#if defined(NIGHTLY_BUILD)
Maybe<DetourError> mLastError;
#endif // defined(NIGHTLY_BUILD)
public:
template <typename... Args>
explicit WindowsDllDetourPatcher(Args&&... aArgs)
@ -140,6 +144,15 @@ class WindowsDllDetourPatcher final
WindowsDllDetourPatcher& operator=(const WindowsDllDetourPatcher&) = delete;
WindowsDllDetourPatcher& operator=(WindowsDllDetourPatcher&&) = delete;
#if defined(NIGHTLY_BUILD)
const Maybe<DetourError>& GetLastError() const { return mLastError; }
void SetLastError(DetourResultCode aError) {
mLastError = Some(DetourError(aError));
}
#else
void SetLastError(DetourResultCode) {}
#endif // defined(NIGHTLY_BUILD)
void Clear() {
if (!this->mVMPolicy.ShouldUnhookUponDestruction()) {
return;
@ -540,11 +553,9 @@ class WindowsDllDetourPatcher final
#endif // defined(_M_X64)
Maybe<TrampPoolT> maybeTrampPool = this->mVMPolicy.Reserve(pivot, distance);
#if defined(NIGHTLY_BUILD)
if (!maybeTrampPool && this->GetLastError().isNothing()) {
if (!maybeTrampPool) {
SetLastError(DetourResultCode::DETOUR_PATCHER_DO_RESERVE_ERROR);
}
#endif // defined(NIGHTLY_BUILD)
return maybeTrampPool;
}
@ -932,19 +943,18 @@ class WindowsDllDetourPatcher final
#if defined(NIGHTLY_BUILD)
origBytes.Rewind();
SetLastError(DetourResultCode::DETOUR_PATCHER_CREATE_TRAMPOLINE_ERROR);
DetourError& lastError = *this->mVMPolicy.mLastError;
size_t bytesToCapture = std::min(
ArrayLength(lastError.mOrigBytes),
ArrayLength(mLastError->mOrigBytes),
static_cast<size_t>(PrimitiveT::GetWorstCaseRequiredBytesToPatch()));
# if defined(_M_ARM64)
size_t numInstructionsToCapture = bytesToCapture / sizeof(uint32_t);
auto origBytesDst = reinterpret_cast<uint32_t*>(lastError.mOrigBytes);
auto origBytesDst = reinterpret_cast<uint32_t*>(mLastError->mOrigBytes);
for (size_t i = 0; i < numInstructionsToCapture; ++i) {
origBytesDst[i] = origBytes.ReadNextInstruction();
}
# else
for (size_t i = 0; i < bytesToCapture; ++i) {
lastError.mOrigBytes[i] = origBytes[i];
mLastError->mOrigBytes[i] = origBytes[i];
}
# endif // defined(_M_ARM64)
#else

18
mozglue/misc/nsWindowsDllInterceptor.h
Просмотреть файл

@ -229,12 +229,7 @@ class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS FuncHookCrossProcess final {
return false;
}
bool ret = CopyStubToChildProcess(origFunc, aProcess);
if (!ret) {
aInterceptor.SetLastError(FUNCHOOKCROSSPROCESS_COPYSTUB_ERROR,
::GetLastError());
}
return ret;
return CopyStubToChildProcess(origFunc, aProcess);
}
bool SetDetour(HANDLE aProcess, InterceptorT& aInterceptor, const char* aName,
@ -245,12 +240,7 @@ class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS FuncHookCrossProcess final {
return false;
}
bool ret = CopyStubToChildProcess(origFunc, aProcess);
if (!ret) {
aInterceptor.SetLastError(FUNCHOOKCROSSPROCESS_COPYSTUB_ERROR,
::GetLastError());
}
return ret;
return CopyStubToChildProcess(origFunc, aProcess);
}
explicit operator bool() const { return !!mOrigFunc; }
@ -376,10 +366,6 @@ class WindowsDllInterceptor final
return mDetourPatcher.GetLastError();
}
#endif // defined(NIGHTLY_BUILD)
template <typename... Args>
void SetLastError(Args&&... aArgs) {
return mDetourPatcher.SetLastError(std::forward<Args>(aArgs)...);
}
constexpr static uint32_t GetWorstCaseRequiredBytesToPatch() {
return WindowsDllDetourPatcherPrimitive<

16
widget/windows/WinHeaderOnlyUtils.h
Просмотреть файл

@ -218,16 +218,6 @@ enum DetourResultCode : uint32_t {
DETOUR_PATCHER_INVALID_TRAMPOLINE,
DETOUR_PATCHER_WRITE_POINTER_ERROR,
DETOUR_PATCHER_CREATE_TRAMPOLINE_ERROR,
FUNCHOOKCROSSPROCESS_COPYSTUB_ERROR,
MMPOLICY_RESERVE_INVALIDARG,
MMPOLICY_RESERVE_ZERO_RESERVATIONSIZE,
MMPOLICY_RESERVE_CREATEFILEMAPPING,
MMPOLICY_RESERVE_MAPVIEWOFFILE,
MMPOLICY_RESERVE_NOBOUND_RESERVE_ERROR,
MMPOLICY_RESERVE_FINDREGION_INVALIDLEN,
MMPOLICY_RESERVE_FINDREGION_INVALIDRANGE,
MMPOLICY_RESERVE_FINDREGION_VIRTUALQUERY_ERROR,
MMPOLICY_RESERVE_FINAL_RESERVE_ERROR,
};
#if defined(NIGHTLY_BUILD)
@ -238,12 +228,6 @@ struct DetourError {
uint8_t mOrigBytes[16];
explicit DetourError(DetourResultCode aError)
: mErrorCode(aError), mOrigBytes{} {}
DetourError(DetourResultCode aError, DWORD aWin32Error)
: mErrorCode(aError), mOrigBytes{} {
static_assert(sizeof(mOrigBytes) >= sizeof(aWin32Error),
"Can't fit a DWORD in mOrigBytes");
*reinterpret_cast<DWORD*>(mOrigBytes) = aWin32Error;
}
operator WindowsError() const {
return WindowsError::FromHResult(mErrorCode);
}