Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: base/memory/shared_memory_win.cc

Issue 1677163003: base: Create file mappings with reduced access control permissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comments, again. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/memory/shared_memory_win.cc
diff --git a/base/memory/shared_memory_win.cc b/base/memory/shared_memory_win.cc
index 791db3f5b38e17ca74543d7422ac1de49181677e..f105418976a3f1f90f353d469973689d05615b8a 100644
--- a/base/memory/shared_memory_win.cc
+++ b/base/memory/shared_memory_win.cc
@@ -62,6 +62,40 @@ bool IsSectionSafeToMap(HANDLE handle) {
return (basic_information.Attributes & SEC_IMAGE) != SEC_IMAGE;
}
+// Returns a HANDLE on success and |nullptr| on failure.
+// This function is similar to CreateFileMapping, but removes the permissions
+// WRITE_DAC, WRITE_OWNER, READ_CONTROL, and DELETE.
+//
+// A newly created file mapping has two sets of permissions. It has access
+// control permissions (WRITE_DAC, WRITE_OWNER, READ_CONTROL, and DELETE) and
+// file permissions (FILE_MAP_READ, FILE_MAP_WRITE, etc.). ::DuplicateHandle()
+// with the parameter DUPLICATE_SAME_ACCESS copies both sets of permissions.
+//
+// The Chrome sandbox prevents HANDLEs with the WRITE_DAC permission from being
+// duplicated into unprivileged processes. But the only way to copy file
+// permissions is with the parameter DUPLICATE_SAME_ACCESS. This means that
+// there is no way for a privileged process to duplicate a file mapping into an
+// unprivileged process while maintaining the previous file permissions.
+//
+// By removing all access control permissions of a file mapping immediately
+// after creation, ::DuplicateHandle() effectively only copies the file
+// permissions.
+HANDLE CreateFileMappingWithReducedPermissions(SECURITY_ATTRIBUTES* sa,
+ size_t rounded_size,
+ LPCWSTR name) {
+ HANDLE h = CreateFileMapping(INVALID_HANDLE_VALUE, sa, PAGE_READWRITE, 0,
+ static_cast<DWORD>(rounded_size), name);
+ if (!h)
+ return nullptr;
+
+ HANDLE h2;
+ BOOL success = ::DuplicateHandle(
+ GetCurrentProcess(), h, GetCurrentProcess(), &h2,
+ FILE_MAP_READ | FILE_MAP_WRITE | SECTION_QUERY, FALSE, 0);
+ ::CloseHandle(h);
Mark Mentovai 2016/02/17 19:03:14 BOOL rv = ::CloseHandle(h); DCHECK(rv); ?
erikchen 2016/02/17 19:22:26 Done.
+ return success ? h2 : nullptr;
+}
+
} // namespace.
namespace base {
@@ -136,8 +170,11 @@ SharedMemoryHandle SharedMemory::DuplicateHandle(
BOOL success =
::DuplicateHandle(process, handle.GetHandle(), process, &duped_handle, 0,
FALSE, DUPLICATE_SAME_ACCESS);
- if (success)
- return SharedMemoryHandle(duped_handle, GetCurrentProcId());
+ if (success) {
+ base::SharedMemoryHandle handle(duped_handle, GetCurrentProcId());
+ handle.SetOwnershipPassesToIPC(true);
+ return handle;
+ }
return SharedMemoryHandle();
}
@@ -166,7 +203,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) {
SECURITY_DESCRIPTOR sd;
ACL dacl;
- if (options.share_read_only && name_.empty()) {
+ if (name_.empty()) {
penny 2016/02/17 00:32:24 So, we're no longer looking at whether |share_read
erikchen 2016/02/17 00:43:22 (1) is a correct assessment. I would prefer to rem
// Add an empty DACL to enforce anonymous read-only sections.
sa.lpSecurityDescriptor = &sd;
if (!InitializeAcl(&dacl, sizeof(dacl), ACL_REVISION))
@@ -184,9 +221,8 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) {
rand_values[0], rand_values[1],
rand_values[2], rand_values[3]);
}
- mapped_file_ = CreateFileMapping(INVALID_HANDLE_VALUE, &sa,
- PAGE_READWRITE, 0, static_cast<DWORD>(rounded_size),
- name_.empty() ? nullptr : name_.c_str());
+ mapped_file_ = CreateFileMappingWithReducedPermissions(
+ &sa, rounded_size, name_.empty() ? nullptr : name_.c_str());
if (!mapped_file_)
return false;

Powered by Google App Engine
This is Rietveld 408576698