lkn
/
pcloudcc-lneely
mirror of https://github.com/lneely/pcloudcc-lneely.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in pfs_reopen_file_for_writing encoder state (#329) 

Crypto folder operations tested, no regression
This commit is contained in:
Levi Neely 2026-03-03 16:18:16 +01:00 committed by GitHub
parent 3e777665b6
commit 72ef56652d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pclsync/pfs.c
View File

@ -2130,17 +2130,24 @@ pfs_reopen_file_for_writing(psync_openfile_t *of) {
if (unlikely(of->encrypted && if (unlikely(of->encrypted &&
of->encoder == PSYNC_CRYPTO_UNLOADED_SECTOR_ENCODER)) { of->encoder == PSYNC_CRYPTO_UNLOADED_SECTOR_ENCODER)) {
pcrypto_sector_encdec_t enc; pcrypto_sector_encdec_t enc;
psync_fsfileid_t remotefileid;
uint64_t hash;
// Save values before unlock
remotefileid = of->remotefileid;
hash = of->hash;
// we should unlock of->mutex as it can deadlock with sqllock and taking // we should unlock of->mutex as it can deadlock with sqllock and taking
// sqllock before network operation is not a good idea // sqllock before network operation is not a good idea
pthread_mutex_unlock(&of->mutex); pthread_mutex_unlock(&of->mutex);
enc = pcryptofolder_filencoder_get(of->remotefileid, of->hash, 0); enc = pcryptofolder_filencoder_get(remotefileid, hash, 0);
if (unlikely(psync_crypto_is_error(enc))) if (unlikely(psync_crypto_is_error(enc)))
return -pfs_crypto_err_to_errno(psync_crypto_to_error(enc)); return -pfs_crypto_err_to_errno(psync_crypto_to_error(enc));
pfs_lock_file(of); pfs_lock_file(of);
if (of->encoder == PSYNC_CRYPTO_UNLOADED_SECTOR_ENCODER) // Check if state changed while unlocked
if (of->encoder == PSYNC_CRYPTO_UNLOADED_SECTOR_ENCODER &&
of->remotefileid == remotefileid && of->hash == hash)
of->encoder = enc; of->encoder = enc;
else else
pcryptofolder_filencoder_release(of->remotefileid, of->hash, enc); pcryptofolder_filencoder_release(remotefileid, hash, enc);
if (of->newfile || of->modified) if (of->newfile || of->modified)
return 1; return 1;
} }