chromium/src
0
Fork 0
Code Activity

Fix SELinux warnings when running on Fedora.

Browse Source 
(c.f. http://people.redhat.com/drepper/selinux-mem.html)

Fix compilation warnings on Fedora.

BUG=none
TEST=when running Chrome on Fedora, verify that we don't get AVC warnings
Review URL: http://codereview.chromium.org/1535004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43107 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
markus@chromium.org
2010-03-30 18:02:14 +00:00
parent 6c9c89b561
commit 0bf514029e
1 changed files with 3 additions and 3 deletions

6
sandbox/linux/seccomp/library.cc

@ -88,7 +88,7 @@ Library::~Library() {
// file. Move the temporarily extended mapping back to where we originally
// found. Make sure to preserve any changes that we might have made since.
Sandbox::SysCalls sys;
sys.mprotect(image_, 4096, PROT_READ | PROT_WRITE);
sys.mprotect(image_, 4096, PROT_READ | PROT_WRITE | PROT_EXEC);
if (memcmp(image_, memory_ranges_.rbegin()->second.start, 4096)) {
// Only copy data, if we made any changes in this data. Otherwise there
// is no need to create another modified COW mapping.
@ -242,7 +242,7 @@ char *Library::getOriginal(Elf_Addr offset, char *buf, size_t len) {
if (image_ == MAP_FAILED) {
image_ = NULL;
} else {
sys.MMAP(start, 4096, PROT_READ | PROT_WRITE,
sys.MMAP(start, 4096, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
for (int i = 4096 / sizeof(long); --i;
reinterpret_cast<long *>(start)[i] =
@ -875,7 +875,7 @@ int Library::patchVSystemCalls() {
// Only x86-64 has VSyscalls.
if (maps_->vsyscall()) {
char* copy = maps_->allocNearAddr(maps_->vsyscall(), 0x1000,
PROT_READ|PROT_WRITE);
PROT_READ|PROT_WRITE|PROT_EXEC);
char* extraSpace = copy;
int extraLength = 0x1000;
memcpy(copy, maps_->vsyscall(), 0x1000);