summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel
diff options
context:
space:
mode:
authorRahat Mahmood <rahat@google.com>2018-11-01 15:53:25 -0700
committerShentubot <shentubot@google.com>2018-11-01 15:54:14 -0700
commit0e277a39c8b6f905e289b75e8ad0594e6b3562ca (patch)
treebb255a4872dcde3d666ee016d98b080366e8810b /pkg/sentry/kernel
parentb23cd33682a9a8bd727fa45b8424eb55d91c3086 (diff)
Prevent premature destruction of shm segments.
Shm segments can be marked for lazy destruction via shmctl(IPC_RMID), which destroys a segment once it is no longer attached to any processes. We were unconditionally decrementing the segment refcount on shmctl(IPC_RMID) which allowed a user to force a segment to be destroyed by repeatedly calling shmctl(IPC_RMID), with outstanding memory maps to the segment. This is problematic because the memory released by a segment destroyed this way can be reused by a different process while remaining accessible by the process with outstanding maps to the segment. PiperOrigin-RevId: 219713660 Change-Id: I443ab838322b4fb418ed87b2722c3413ead21845
Diffstat (limited to 'pkg/sentry/kernel')
-rw-r--r--pkg/sentry/kernel/shm/shm.go13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/shm/shm.go b/pkg/sentry/kernel/shm/shm.go
index 2feffe612..f760f5f76 100644
--- a/pkg/sentry/kernel/shm/shm.go
+++ b/pkg/sentry/kernel/shm/shm.go
@@ -575,10 +575,19 @@ func (s *Shm) destroy() {
func (s *Shm) MarkDestroyed() {
s.mu.Lock()
defer s.mu.Unlock()
+
// Prevent the segment from being found in the registry.
s.key = linux.IPC_PRIVATE
- s.pendingDestruction = true
- s.DecRef()
+
+ // Only drop the segment's self-reference once, when destruction is
+ // requested. Otherwise, repeated calls shmctl(IPC_RMID) would force a
+ // segment to be destroyed prematurely, potentially with active maps to the
+ // segment's address range. Remaining references are dropped when the
+ // segment is detached or unmaped.
+ if !s.pendingDestruction {
+ s.pendingDestruction = true
+ s.DecRef()
+ }
}
// checkOwnership verifies whether a segment may be accessed by ctx as an