From c6c38d5c4b35b5604e79d5b3da674d3e7ebb3b12 Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Tue, 18 Oct 2022 14:44:57 -0700 Subject: [PATCH] Fix panic in lisafs When mount fails, `filesystem.Release()` attempts to dereference a nil `filesystem.clientLisa`. PiperOrigin-RevId: 482027422 --- pkg/sentry/fsimpl/gofer/gofer.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/sentry/fsimpl/gofer/gofer.go b/pkg/sentry/fsimpl/gofer/gofer.go index ae3fbfbfe..6f09f31e5 100644 --- a/pkg/sentry/fsimpl/gofer/gofer.go +++ b/pkg/sentry/fsimpl/gofer/gofer.go @@ -743,9 +743,13 @@ func (fs *filesystem) Release(ctx context.Context) { if !fs.iopts.LeakConnection { // Close the connection to the server. This implicitly clunks all fids. if fs.opts.lisaEnabled { - fs.clientLisa.Close() + if fs.clientLisa != nil { + fs.clientLisa.Close() + } } else { - fs.client.Close() + if fs.client != nil { + fs.client.Close() + } } }