Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

vfs: fix fatal error: sync: unlock of unlocked mutex in panics

Nick Craig-Wood4ed4483bbc49
diff --git a/vfs/vfscache/item.go b/vfs/vfscache/item.go
index 6cc68d1e5..702847719 100644
--- a/vfs/vfscache/item.go
+++ b/vfs/vfscache/item.go
@@ -573,6 +573,15 @@ func (item *Item) open(o fs.Object) (err error) {
return err
}
+// Calls f with mu unlocked, re-locking mu if a panic is raised
+//
+// mu must be locked when calling this function
+func unlockMutexForCall(mu *sync.Mutex, f func()) {
+ mu.Unlock()
+ defer mu.Lock()
+ f()
+}
+
// Store stores the local cache file to the remote object, returning
// the new remote object. objOld is the old object if known.
//
@@ -589,9 +598,9 @@ func (item *Item) _store(ctx context.Context, storeFn StoreFn) (err error) {
// Object has disappeared if cacheObj == nil
if cacheObj != nil {
o, name := item.o, item.name
- item.mu.Unlock()
- o, err := operations.Copy(ctx, item.c.fremote, o, name, cacheObj)
- item.mu.Lock()
+ unlockMutexForCall(&item.mu, func() {
+ o, err = operations.Copy(ctx, item.c.fremote, o, name, cacheObj)
+ })
if err != nil {
if errors.Is(err, fs.ErrorCantUploadEmptyFiles) {
fs.Errorf(name, "Writeback failed: %v", err)