diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-16 14:25:03 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-16 14:25:03 +0000 |
| commit | 421551607bdee875b9502d8fd74bdcf69e009fe2 (patch) | |
| tree | 238f862d09341e578cf701ac418898ccd482f83c /base/shared_memory.h | |
| parent | ce0afe43c8cfaef0d642f77a625ec63eca5b6a3d (diff) | |
| download | chromium_src-421551607bdee875b9502d8fd74bdcf69e009fe2.zip chromium_src-421551607bdee875b9502d8fd74bdcf69e009fe2.tar.gz chromium_src-421551607bdee875b9502d8fd74bdcf69e009fe2.tar.bz2 | |
Chrome Frame: Add explicit object security attributes to the Chrome Frame version beacon. This will allow low integrity processes to access shared memory segment and lock and make shared memory segment read only after creation.
Also use lock names that include the hosting process.
BUG=61609
TEST=Start medium integrity Chrome Frame host running CF version X. Update CF to version Y > X. Start low integrity Chrome Frame host, observe that version X is loaded.
Review URL: http://codereview.chromium.org/5012001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/shared_memory.h')
| -rw-r--r-- | base/shared_memory.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/base/shared_memory.h b/base/shared_memory.h index 719eb69..a088682 100644 --- a/base/shared_memory.h +++ b/base/shared_memory.h @@ -173,9 +173,11 @@ class SharedMemory { void Lock(); #if defined(OS_WIN) - // A Lock() implementation with a timeout. Returns true if the Lock() has - // been acquired, false if the timeout was reached. - bool Lock(uint32 timeout_ms); + // A Lock() implementation with a timeout that also allows setting + // security attributes on the mutex. sec_attr may be NULL. + // Returns true if the Lock() has been acquired, false if the timeout was + // reached. + bool Lock(uint32 timeout_ms, SECURITY_ATTRIBUTES* sec_attr); #endif // Releases the shared memory lock. |