mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-03 12:35:58 +00:00
Bug 820852 - Implement write poisoning on Windows. r=ehsan,espindola
This commit is contained in:
parent
181620adce
commit
d3f87cf69c
@ -361,6 +361,9 @@ protected:
|
||||
// complex MOV, bail
|
||||
return;
|
||||
}
|
||||
} else if (origBytes[nBytes] == 0xB8) {
|
||||
// MOV 0xB8: http://ref.x86asm.net/coder32.html#xB8
|
||||
nBytes += 5;
|
||||
} else if (origBytes[nBytes] == 0x83) {
|
||||
// ADD|ODR|ADC|SBB|AND|SUB|XOR|CMP r/m, imm8
|
||||
unsigned char b = origBytes[nBytes+1];
|
||||
|
@ -116,6 +116,7 @@ int main()
|
||||
TestHook("user32.dll", "SetWindowLongW") &&
|
||||
#endif
|
||||
TestHook("user32.dll", "TrackPopupMenu") &&
|
||||
TestHook("ntdll.dll", "NtFlushBuffersFile") &&
|
||||
TestHook("ntdll.dll", "LdrLoadDll")) {
|
||||
printf("TEST-PASS | WindowsDllInterceptor | all checks passed\n");
|
||||
return 0;
|
||||
|
@ -42,7 +42,9 @@ CPPSRCS = \
|
||||
$(NULL)
|
||||
|
||||
ifeq (Darwin, $(OS_ARCH))
|
||||
CPPSRCS += mozPoisonWriteMac.cpp
|
||||
CPPSRCS += mozPoisonWriteBase.cpp mozPoisonWriteMac.cpp
|
||||
else ifeq ($(OS_ARCH),WINNT)
|
||||
CPPSRCS += mozPoisonWriteBase.cpp mozPoisonWriteWin.cpp
|
||||
else
|
||||
CPPSRCS += mozPoisonWriteStub.cpp
|
||||
endif
|
||||
|
@ -4,11 +4,15 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef MOZPOISONWRITE_H
|
||||
#define MOZPOISONWRITE_H
|
||||
|
||||
#include "mozilla/Types.h"
|
||||
#include <stdio.h>
|
||||
|
||||
MOZ_BEGIN_EXTERN_C
|
||||
void MozillaRegisterDebugFD(int fd);
|
||||
void MozillaRegisterDebugFILE(FILE *f);
|
||||
void MozillaUnRegisterDebugFD(int fd);
|
||||
void MozillaUnRegisterDebugFILE(FILE *f);
|
||||
MOZ_END_EXTERN_C
|
||||
@ -20,3 +24,5 @@ void DisableWritePoisoning();
|
||||
void EnableWritePoisoning();
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
267
xpcom/build/mozPoisonWriteBase.cpp
Normal file
267
xpcom/build/mozPoisonWriteBase.cpp
Normal file
@ -0,0 +1,267 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:set ts=2 sw=2 sts=2 ci et: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "mozPoisonWrite.h"
|
||||
#include "mozPoisonWriteBase.h"
|
||||
#include "mozilla/ProcessedStack.h"
|
||||
#include "mozilla/Scoped.h"
|
||||
#include "mozilla/SHA1.h"
|
||||
#include "mozilla/Telemetry.h"
|
||||
#include "nsAppDirectoryServiceDefs.h"
|
||||
#include "nsDirectoryServiceUtils.h"
|
||||
#include "nsStackWalk.h"
|
||||
#include "nsPrintfCString.h"
|
||||
#include "plstr.h"
|
||||
#include <algorithm>
|
||||
#ifdef XP_WIN
|
||||
#define NS_T(str) L ## str
|
||||
#define NS_SLASH "\\"
|
||||
#include <windows.h>
|
||||
#include <io.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/stat.h>
|
||||
#else
|
||||
#define NS_SLASH "/"
|
||||
#endif
|
||||
using namespace mozilla;
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
static char *sProfileDirectory = NULL;
|
||||
|
||||
std::vector<int>& getDebugFDs() {
|
||||
// We have to use new as some write happen during static destructors
|
||||
// so an static std::vector might be destroyed while we still need it.
|
||||
static std::vector<int> *DebugFDs = new std::vector<int>();
|
||||
return *DebugFDs;
|
||||
}
|
||||
|
||||
void PoisonWriteBase()
|
||||
{
|
||||
nsCOMPtr<nsIFile> mozFile;
|
||||
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mozFile));
|
||||
if (mozFile) {
|
||||
nsAutoCString nativePath;
|
||||
nsresult rv = mozFile->GetNativePath(nativePath);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
sProfileDirectory = PL_strdup(nativePath.get());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void BaseCleanup() {
|
||||
PL_strfree(sProfileDirectory);
|
||||
sProfileDirectory = nullptr;
|
||||
delete &getDebugFDs();
|
||||
PR_DestroyLock(DebugFDAutoLock::getDebugFDsLock());
|
||||
}
|
||||
|
||||
// This a wrapper over a file descriptor that provides a Printf method and
|
||||
// computes the sha1 of the data that passes through it.
|
||||
class SHA1Stream
|
||||
{
|
||||
public:
|
||||
explicit SHA1Stream(FILE *stream)
|
||||
: mFile(stream)
|
||||
{
|
||||
MozillaRegisterDebugFILE(mFile);
|
||||
}
|
||||
|
||||
void Printf(const char *aFormat, ...)
|
||||
{
|
||||
MOZ_ASSERT(mFile);
|
||||
va_list list;
|
||||
va_start(list, aFormat);
|
||||
nsAutoCString str;
|
||||
str.AppendPrintf(aFormat, list);
|
||||
va_end(list);
|
||||
mSHA1.update(str.get(), str.Length());
|
||||
fwrite(str.get(), 1, str.Length(), mFile);
|
||||
}
|
||||
void Finish(SHA1Sum::Hash &aHash)
|
||||
{
|
||||
int fd = fileno(mFile);
|
||||
fflush(mFile);
|
||||
MozillaUnRegisterDebugFD(fd);
|
||||
fclose(mFile);
|
||||
mSHA1.finish(aHash);
|
||||
mFile = NULL;
|
||||
}
|
||||
private:
|
||||
FILE *mFile;
|
||||
SHA1Sum mSHA1;
|
||||
};
|
||||
|
||||
static void RecordStackWalker(void *aPC, void *aSP, void *aClosure)
|
||||
{
|
||||
std::vector<uintptr_t> *stack =
|
||||
static_cast<std::vector<uintptr_t>*>(aClosure);
|
||||
stack->push_back(reinterpret_cast<uintptr_t>(aPC));
|
||||
}
|
||||
|
||||
bool ValidWriteAssert(bool ok)
|
||||
{
|
||||
// On a debug build, just crash.
|
||||
MOZ_ASSERT(ok);
|
||||
|
||||
if (ok || !sProfileDirectory || !Telemetry::CanRecord())
|
||||
return ok;
|
||||
|
||||
// Write the stack and loaded libraries to a file. We can get here
|
||||
// concurrently from many writes, so we use multiple temporary files.
|
||||
std::vector<uintptr_t> rawStack;
|
||||
|
||||
NS_StackWalk(RecordStackWalker, /* skipFrames */ 0, /* maxFrames */ 0,
|
||||
reinterpret_cast<void*>(&rawStack), 0, nullptr);
|
||||
Telemetry::ProcessedStack stack = Telemetry::GetStackAndModules(rawStack);
|
||||
|
||||
nsPrintfCString nameAux("%s%s%s", sProfileDirectory,
|
||||
NS_SLASH, "Telemetry.LateWriteTmpXXXXXX");
|
||||
char *name;
|
||||
nameAux.GetMutableData(&name);
|
||||
|
||||
// We want the sha1 of the entire file, so please don't write to fd
|
||||
// directly; use sha1Stream.
|
||||
FILE *stream;
|
||||
#ifdef XP_WIN
|
||||
HANDLE hFile;
|
||||
do {
|
||||
// mkstemp isn't supported so keep trying until we get a file
|
||||
int result = _mktemp_s(name, strlen(name) + 1);
|
||||
hFile = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
} while (GetLastError() == ERROR_FILE_EXISTS);
|
||||
|
||||
if (hFile == INVALID_HANDLE_VALUE) {
|
||||
NS_RUNTIMEABORT("Um, how did we get here?");
|
||||
}
|
||||
|
||||
// http://support.microsoft.com/kb/139640
|
||||
int fd = _open_osfhandle((intptr_t)hFile, _O_APPEND);
|
||||
if (fd == -1) {
|
||||
NS_RUNTIMEABORT("Um, how did we get here?");
|
||||
}
|
||||
|
||||
stream = _fdopen(fd, "w");
|
||||
#else
|
||||
int fd = mkstemp(name);
|
||||
stream = fdopen(fd, "w");
|
||||
#endif
|
||||
|
||||
SHA1Stream sha1Stream(stream);
|
||||
|
||||
size_t numModules = stack.GetNumModules();
|
||||
sha1Stream.Printf("%u\n", (unsigned)numModules);
|
||||
for (size_t i = 0; i < numModules; ++i) {
|
||||
Telemetry::ProcessedStack::Module module = stack.GetModule(i);
|
||||
sha1Stream.Printf("%s %s\n", module.mBreakpadId.c_str(),
|
||||
module.mName.c_str());
|
||||
}
|
||||
|
||||
size_t numFrames = stack.GetStackSize();
|
||||
sha1Stream.Printf("%u\n", (unsigned)numFrames);
|
||||
for (size_t i = 0; i < numFrames; ++i) {
|
||||
const Telemetry::ProcessedStack::Frame &frame =
|
||||
stack.GetFrame(i);
|
||||
// NOTE: We write the offsets, while the atos tool expects a value with
|
||||
// the virtual address added. For example, running otool -l on the the firefox
|
||||
// binary shows
|
||||
// cmd LC_SEGMENT_64
|
||||
// cmdsize 632
|
||||
// segname __TEXT
|
||||
// vmaddr 0x0000000100000000
|
||||
// so to print the line matching the offset 123 one has to run
|
||||
// atos -o firefox 0x100000123.
|
||||
sha1Stream.Printf("%d %x\n", frame.mModIndex, (unsigned)frame.mOffset);
|
||||
}
|
||||
|
||||
SHA1Sum::Hash sha1;
|
||||
sha1Stream.Finish(sha1);
|
||||
|
||||
// Note: These files should be deleted by telemetry once it reads them. If
|
||||
// there were no telemery runs by the time we shut down, we just add files
|
||||
// to the existing ones instead of replacing them. Given that each of these
|
||||
// files is a bug to be fixed, that is probably the right thing to do.
|
||||
|
||||
// We append the sha1 of the contents to the file name. This provides a simple
|
||||
// client side deduplication.
|
||||
nsPrintfCString finalName("%s%s", sProfileDirectory, "/Telemetry.LateWriteFinal-");
|
||||
for (int i = 0; i < 20; ++i) {
|
||||
finalName.AppendPrintf("%02x", sha1[i]);
|
||||
}
|
||||
PR_Delete(finalName.get());
|
||||
PR_Rename(name, finalName.get());
|
||||
return false;
|
||||
}
|
||||
|
||||
enum PoisonState {
|
||||
POISON_UNINITIALIZED = 0,
|
||||
POISON_ON,
|
||||
POISON_OFF
|
||||
};
|
||||
|
||||
// POISON_OFF has two consequences
|
||||
// * It prevents PoisonWrite from patching the write functions.
|
||||
// * If the patching has already been done, it prevents AbortOnBadWrite from
|
||||
// asserting. Note that not all writes use AbortOnBadWrite at this point
|
||||
// (aio_write for example), so disabling writes after patching doesn't
|
||||
// completely undo it.
|
||||
PoisonState sPoisoningState = POISON_UNINITIALIZED;
|
||||
|
||||
void DisableWritePoisoning() {
|
||||
if (sPoisoningState == POISON_ON) {
|
||||
sPoisoningState = POISON_OFF;
|
||||
BaseCleanup();
|
||||
}
|
||||
}
|
||||
void EnableWritePoisoning() {
|
||||
sPoisoningState = POISON_ON;
|
||||
}
|
||||
|
||||
bool PoisonWriteEnabled()
|
||||
{
|
||||
return sPoisoningState == POISON_ON;
|
||||
}
|
||||
|
||||
} // mozilla
|
||||
|
||||
extern "C" {
|
||||
void MozillaRegisterDebugFD(int fd) {
|
||||
if (sPoisoningState == POISON_OFF)
|
||||
return;
|
||||
DebugFDAutoLock lockedScope;
|
||||
std::vector<int> &Vec = getDebugFDs();
|
||||
MOZ_ASSERT(std::find(Vec.begin(), Vec.end(), fd) == Vec.end());
|
||||
Vec.push_back(fd);
|
||||
}
|
||||
void MozillaRegisterDebugFILE(FILE *f) {
|
||||
if (sPoisoningState == POISON_OFF)
|
||||
return;
|
||||
int fd = fileno(f);
|
||||
if (fd == 1 || fd == 2)
|
||||
return;
|
||||
MozillaRegisterDebugFD(fd);
|
||||
}
|
||||
void MozillaUnRegisterDebugFD(int fd) {
|
||||
if (sPoisoningState == POISON_OFF)
|
||||
return;
|
||||
DebugFDAutoLock lockedScope;
|
||||
std::vector<int> &Vec = getDebugFDs();
|
||||
std::vector<int>::iterator i = std::find(Vec.begin(), Vec.end(), fd);
|
||||
MOZ_ASSERT(i != Vec.end());
|
||||
Vec.erase(i);
|
||||
}
|
||||
void MozillaUnRegisterDebugFILE(FILE *f) {
|
||||
if (sPoisoningState == POISON_OFF)
|
||||
return;
|
||||
int fd = fileno(f);
|
||||
if (fd == 1 || fd == 2)
|
||||
return;
|
||||
fflush(f);
|
||||
MozillaUnRegisterDebugFD(fd);
|
||||
}
|
||||
}
|
56
xpcom/build/mozPoisonWriteBase.h
Normal file
56
xpcom/build/mozPoisonWriteBase.h
Normal file
@ -0,0 +1,56 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:set ts=2 sw=2 sts=2 ci et: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// Private interface for code shared between the platforms of mozPoisonWriteXXX
|
||||
|
||||
#ifndef MOZPOISONWRITEBASE_H
|
||||
#define MOZPOISONWRITEBASE_H
|
||||
|
||||
#include <stdio.h>
|
||||
#include <vector>
|
||||
#include "nspr.h"
|
||||
#include "mozilla/Util.h"
|
||||
#include "mozilla/Scoped.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
|
||||
struct DebugFDAutoLockTraits {
|
||||
typedef PRLock *type;
|
||||
const static type empty() {
|
||||
return nullptr;
|
||||
}
|
||||
const static void release(type aL) {
|
||||
PR_Unlock(aL);
|
||||
}
|
||||
};
|
||||
|
||||
class DebugFDAutoLock : public Scoped<DebugFDAutoLockTraits> {
|
||||
public:
|
||||
static PRLock *getDebugFDsLock() {
|
||||
// We have to use something lower level than a mutex. If we don't, we
|
||||
// can get recursive in here when called from logging a call to free.
|
||||
static PRLock *Lock = PR_NewLock();
|
||||
return Lock;
|
||||
}
|
||||
|
||||
DebugFDAutoLock() : Scoped<DebugFDAutoLockTraits>(getDebugFDsLock()) {
|
||||
PR_Lock(get());
|
||||
}
|
||||
};
|
||||
|
||||
bool PoisonWriteEnabled();
|
||||
void PoisonWriteBase();
|
||||
bool ValidWriteAssert(bool ok);
|
||||
void BaseCleanup();
|
||||
// This method should always be called with the debugFDs lock.
|
||||
// Note: MSVC Local static is NOT thread safe
|
||||
// http://stackoverflow.com/questions/10585928/is-static-init-thread-safe-with-vc2010
|
||||
std::vector<int>& getDebugFDs();
|
||||
|
||||
}
|
||||
|
||||
#endif
|
@ -5,6 +5,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "mozilla/mozPoisonWrite.h"
|
||||
#include "mozPoisonWriteBase.h"
|
||||
#include "mozilla/Util.h"
|
||||
#include "nsTraceRefcntImpl.h"
|
||||
#include "mozilla/Assertions.h"
|
||||
@ -41,120 +42,6 @@ struct FuncData {
|
||||
// 'Function' after it has been replaced.
|
||||
};
|
||||
|
||||
// This a wrapper over a file descriptor that provides a Printf method and
|
||||
// computes the sha1 of the data that passes through it.
|
||||
class SHA1Stream
|
||||
{
|
||||
public:
|
||||
SHA1Stream(int aFd) {
|
||||
MozillaRegisterDebugFD(aFd);
|
||||
mFile = fdopen(aFd, "w");
|
||||
}
|
||||
void Printf(const char *aFormat, ...)
|
||||
{
|
||||
MOZ_ASSERT(mFile);
|
||||
va_list list;
|
||||
va_start(list, aFormat);
|
||||
nsAutoCString str;
|
||||
str.AppendPrintf(aFormat, list);
|
||||
va_end(list);
|
||||
mSHA1.update(str.get(), str.Length());
|
||||
fwrite(str.get(), 1, str.Length(), mFile);
|
||||
}
|
||||
void Finish(SHA1Sum::Hash &aHash)
|
||||
{
|
||||
int fd = fileno(mFile);
|
||||
fflush(mFile);
|
||||
MozillaUnRegisterDebugFD(fd);
|
||||
fclose(mFile);
|
||||
mSHA1.finish(aHash);
|
||||
mFile = NULL;
|
||||
}
|
||||
private:
|
||||
FILE *mFile;
|
||||
SHA1Sum mSHA1;
|
||||
};
|
||||
|
||||
void RecordStackWalker(void *aPC, void *aSP, void *aClosure)
|
||||
{
|
||||
std::vector<uintptr_t> *stack =
|
||||
static_cast<std::vector<uintptr_t>*>(aClosure);
|
||||
stack->push_back(reinterpret_cast<uintptr_t>(aPC));
|
||||
}
|
||||
|
||||
char *sProfileDirectory = NULL;
|
||||
|
||||
bool ValidWriteAssert(bool ok)
|
||||
{
|
||||
// On a debug build, just crash.
|
||||
MOZ_ASSERT(ok);
|
||||
|
||||
if (ok || !sProfileDirectory || !Telemetry::CanRecord())
|
||||
return ok;
|
||||
|
||||
// Write the stack and loaded libraries to a file. We can get here
|
||||
// concurrently from many writes, so we use multiple temporary files.
|
||||
std::vector<uintptr_t> rawStack;
|
||||
|
||||
NS_StackWalk(RecordStackWalker, /* skipFrames */ 0, /* maxFrames */ 0,
|
||||
reinterpret_cast<void*>(&rawStack), 0, nullptr);
|
||||
Telemetry::ProcessedStack stack = Telemetry::GetStackAndModules(rawStack);
|
||||
|
||||
nsPrintfCString nameAux("%s%s", sProfileDirectory,
|
||||
"/Telemetry.LateWriteTmpXXXXXX");
|
||||
char *name;
|
||||
nameAux.GetMutableData(&name);
|
||||
|
||||
// We want the sha1 of the entire file, so please don't write to fd
|
||||
// directly; use sha1Stream.
|
||||
int fd = mkstemp(name);
|
||||
SHA1Stream sha1Stream(fd);
|
||||
fd = 0;
|
||||
|
||||
size_t numModules = stack.GetNumModules();
|
||||
sha1Stream.Printf("%u\n", (unsigned)numModules);
|
||||
for (int i = 0; i < numModules; ++i) {
|
||||
Telemetry::ProcessedStack::Module module = stack.GetModule(i);
|
||||
sha1Stream.Printf("%s %s\n", module.mBreakpadId.c_str(),
|
||||
module.mName.c_str());
|
||||
}
|
||||
|
||||
size_t numFrames = stack.GetStackSize();
|
||||
sha1Stream.Printf("%u\n", (unsigned)numFrames);
|
||||
for (size_t i = 0; i < numFrames; ++i) {
|
||||
const Telemetry::ProcessedStack::Frame &frame =
|
||||
stack.GetFrame(i);
|
||||
// NOTE: We write the offsets, while the atos tool expects a value with
|
||||
// the virtual address added. For example, running otool -l on the the firefox
|
||||
// binary shows
|
||||
// cmd LC_SEGMENT_64
|
||||
// cmdsize 632
|
||||
// segname __TEXT
|
||||
// vmaddr 0x0000000100000000
|
||||
// so to print the line matching the offset 123 one has to run
|
||||
// atos -o firefox 0x100000123.
|
||||
sha1Stream.Printf("%d %x\n", frame.mModIndex, (unsigned)frame.mOffset);
|
||||
}
|
||||
|
||||
SHA1Sum::Hash sha1;
|
||||
sha1Stream.Finish(sha1);
|
||||
|
||||
// Note: These files should be deleted by telemetry once it reads them. If
|
||||
// there were no telemery runs by the time we shut down, we just add files
|
||||
// to the existing ones instead of replacing them. Given that each of these
|
||||
// files is a bug to be fixed, that is probably the right thing to do.
|
||||
|
||||
// We append the sha1 of the contents to the file name. This provides a simple
|
||||
// client side deduplication.
|
||||
nsPrintfCString finalName("%s%s", sProfileDirectory, "/Telemetry.LateWriteFinal-");
|
||||
for (int i = 0; i < 20; ++i) {
|
||||
finalName.AppendPrintf("%02x", sha1[i]);
|
||||
}
|
||||
PR_Delete(finalName.get());
|
||||
PR_Rename(name, finalName.get());
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wrap aio_write. We have not seen it before, so just assert/report it.
|
||||
typedef ssize_t (*aio_write_t)(struct aiocb *aiocbp);
|
||||
ssize_t wrap_aio_write(struct aiocb *aiocbp);
|
||||
@ -248,13 +135,6 @@ FuncData *Functions[] = { &aio_write_data,
|
||||
|
||||
const int NumFunctions = ArrayLength(Functions);
|
||||
|
||||
std::vector<int>& getDebugFDs() {
|
||||
// We have to use new as some write happen during static destructors
|
||||
// so an static std::vector might be destroyed while we still need it.
|
||||
static std::vector<int> *DebugFDs = new std::vector<int>();
|
||||
return *DebugFDs;
|
||||
}
|
||||
|
||||
struct AutoLockTraits {
|
||||
typedef PRLock *type;
|
||||
const static type empty() {
|
||||
@ -279,14 +159,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
// This variable being true has two consequences
|
||||
// * It prevents PoisonWrite from patching the write functions.
|
||||
// * If the patching has already been done, it prevents AbortOnBadWrite from
|
||||
// asserting. Note that not all writes use AbortOnBadWrite at this point
|
||||
// (aio_write for example), so disabling writes after patching doesn't
|
||||
// completely undo it.
|
||||
bool PoisoningDisabled = true;
|
||||
|
||||
// We want to detect "actual" writes, not IPC. Some IPC mechanisms are
|
||||
// implemented with file descriptors, so filter them out.
|
||||
bool IsIPCWrite(int fd, const struct stat &buf) {
|
||||
@ -308,7 +180,7 @@ bool IsIPCWrite(int fd, const struct stat &buf) {
|
||||
}
|
||||
|
||||
void AbortOnBadWrite(int fd, const void *wbuf, size_t count) {
|
||||
if (PoisoningDisabled)
|
||||
if (!PoisonWriteEnabled())
|
||||
return;
|
||||
|
||||
// Ignore writes of zero bytes, firefox does some during shutdown.
|
||||
@ -361,47 +233,8 @@ void AbortOnBadWrite(int fd, const void *wbuf, size_t count) {
|
||||
if (!ValidWriteAssert(pos2 == pos))
|
||||
return;
|
||||
}
|
||||
|
||||
// We cannot use destructors to free the lock and the list of debug fds since
|
||||
// we don't control the order the destructors are called. Instead, we use
|
||||
// libc funcion __cleanup callback which runs after the destructors.
|
||||
void (*OldCleanup)();
|
||||
extern "C" void (*__cleanup)();
|
||||
void FinalCleanup() {
|
||||
if (OldCleanup)
|
||||
OldCleanup();
|
||||
if (sProfileDirectory)
|
||||
PL_strfree(sProfileDirectory);
|
||||
sProfileDirectory = nullptr;
|
||||
delete &getDebugFDs();
|
||||
PR_DestroyLock(MyAutoLock::getDebugFDsLock());
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
extern "C" {
|
||||
void MozillaRegisterDebugFD(int fd) {
|
||||
MyAutoLock lockedScope;
|
||||
std::vector<int> &Vec = getDebugFDs();
|
||||
MOZ_ASSERT(std::find(Vec.begin(), Vec.end(), fd) == Vec.end());
|
||||
Vec.push_back(fd);
|
||||
}
|
||||
void MozillaUnRegisterDebugFD(int fd) {
|
||||
MyAutoLock lockedScope;
|
||||
std::vector<int> &Vec = getDebugFDs();
|
||||
std::vector<int>::iterator i = std::find(Vec.begin(), Vec.end(), fd);
|
||||
MOZ_ASSERT(i != Vec.end());
|
||||
Vec.erase(i);
|
||||
}
|
||||
void MozillaUnRegisterDebugFILE(FILE *f) {
|
||||
int fd = fileno(f);
|
||||
if (fd == 1 || fd == 2)
|
||||
return;
|
||||
fflush(f);
|
||||
MozillaUnRegisterDebugFD(fd);
|
||||
}
|
||||
}
|
||||
|
||||
namespace mozilla {
|
||||
void PoisonWrite() {
|
||||
// Quick sanity check that we don't poison twice.
|
||||
@ -411,21 +244,10 @@ void PoisonWrite() {
|
||||
return;
|
||||
WritesArePoisoned = true;
|
||||
|
||||
if (PoisoningDisabled)
|
||||
if (!PoisonWriteEnabled())
|
||||
return;
|
||||
|
||||
nsCOMPtr<nsIFile> mozFile;
|
||||
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mozFile));
|
||||
if (mozFile) {
|
||||
nsAutoCString nativePath;
|
||||
nsresult rv = mozFile->GetNativePath(nativePath);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
sProfileDirectory = PL_strdup(nativePath.get());
|
||||
}
|
||||
}
|
||||
|
||||
OldCleanup = __cleanup;
|
||||
__cleanup = FinalCleanup;
|
||||
PoisonWriteBase();
|
||||
|
||||
for (int i = 0; i < NumFunctions; ++i) {
|
||||
FuncData *d = Functions[i];
|
||||
@ -433,15 +255,9 @@ void PoisonWrite() {
|
||||
d->Function = dlsym(RTLD_DEFAULT, d->Name);
|
||||
if (!d->Function)
|
||||
continue;
|
||||
mach_error_t t = mach_override_ptr(d->Function, d->Wrapper,
|
||||
DebugOnly<mach_error_t> t = mach_override_ptr(d->Function, d->Wrapper,
|
||||
&d->Buffer);
|
||||
MOZ_ASSERT(t == err_none);
|
||||
}
|
||||
}
|
||||
void DisableWritePoisoning() {
|
||||
PoisoningDisabled = true;
|
||||
}
|
||||
void EnableWritePoisoning() {
|
||||
PoisoningDisabled = false;
|
||||
}
|
||||
}
|
||||
|
@ -16,6 +16,8 @@ void EnableWritePoisoning() {
|
||||
extern "C" {
|
||||
void MozillaRegisterDebugFD(int fd) {
|
||||
}
|
||||
void MozillaRegisterDebugFILE(FILE *f) {
|
||||
}
|
||||
void MozillaUnRegisterDebugFD(int fd) {
|
||||
}
|
||||
void MozillaUnRegisterDebugFILE(FILE *f) {
|
||||
|
57
xpcom/build/mozPoisonWriteWin.cpp
Normal file
57
xpcom/build/mozPoisonWriteWin.cpp
Normal file
@ -0,0 +1,57 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:set ts=2 sw=2 sts=2 ci et: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <windows.h>
|
||||
#include <winternl.h> // NTSTATUS
|
||||
#include "nsWindowsDllInterceptor.h"
|
||||
#include "mozilla/mozPoisonWrite.h"
|
||||
#include "mozPoisonWriteBase.h"
|
||||
#include "mozilla/Assertions.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
static WindowsDllInterceptor sNtDllInterceptor;
|
||||
|
||||
void AbortOnBadWrite();
|
||||
bool ValidWriteAssert(bool ok);
|
||||
|
||||
typedef NTSTATUS (WINAPI* FlushBuffersFile_fn)(HANDLE, PIO_STATUS_BLOCK);
|
||||
FlushBuffersFile_fn gOriginalFlushBuffersFile;
|
||||
|
||||
NTSTATUS WINAPI
|
||||
patched_FlushBuffersFile(HANDLE aFileHandle, PIO_STATUS_BLOCK aIoStatusBlock)
|
||||
{
|
||||
AbortOnBadWrite();
|
||||
return gOriginalFlushBuffersFile(aFileHandle, aIoStatusBlock);
|
||||
}
|
||||
|
||||
void AbortOnBadWrite()
|
||||
{
|
||||
if (!PoisonWriteEnabled())
|
||||
return;
|
||||
|
||||
ValidWriteAssert(false);
|
||||
}
|
||||
|
||||
void PoisonWrite() {
|
||||
// Quick sanity check that we don't poison twice.
|
||||
static bool WritesArePoisoned = false;
|
||||
MOZ_ASSERT(!WritesArePoisoned);
|
||||
if (WritesArePoisoned)
|
||||
return;
|
||||
WritesArePoisoned = true;
|
||||
|
||||
if (!PoisonWriteEnabled())
|
||||
return;
|
||||
|
||||
PoisonWriteBase();
|
||||
|
||||
sNtDllInterceptor.Init("ntdll.dll");
|
||||
sNtDllInterceptor.AddHook("NtFlushBuffersFile", reinterpret_cast<intptr_t>(patched_FlushBuffersFile), reinterpret_cast<void**>(&gOriginalFlushBuffersFile));
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user