Don't read cwd or root without holding mu

PiperOrigin-RevId: 202043090
Change-Id: I3c47fb3413ca8615d50d8a0503d72fcce9b09421

1 files changed, 10 insertions, 4 deletions

diff --git a/pkg/sentry/kernel/fs_context.go b/pkg/sentry/kernel/fs_context.go
index 9aa6fa951..d1ca9c09d 100644
--- a/pkg/sentry/kernel/fs_context.go
+++ b/pkg/sentry/kernel/fs_context.go
@@ -114,11 +114,14 @@ func (f *FSContext) SetWorkingDirectory(d *fs.Dirent) {
 	if d == nil {
 		panic("FSContext.SetWorkingDirectory called with nil dirent")
 	}
+
+	f.mu.Lock()
+	defer f.mu.Unlock()
+
 	if f.cwd == nil {
 		panic(fmt.Sprintf("FSContext.SetWorkingDirectory(%v)) called after destroy", d))
 	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
+
 	old := f.cwd
 	f.cwd = d
 	d.IncRef()
@@ -144,11 +147,14 @@ func (f *FSContext) SetRootDirectory(d *fs.Dirent) {
 	if d == nil {
 		panic("FSContext.SetRootDirectory called with nil dirent")
 	}
+
+	f.mu.Lock()
+	defer f.mu.Unlock()
+
 	if f.root == nil {
 		panic(fmt.Sprintf("FSContext.SetRootDirectory(%v)) called after destroy", d))
 	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
+
 	old := f.root
 	f.root = d
 	d.IncRef()