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

Fix data race on lastseed in prand_seed() (#330) 

Mutex protects lastseed read/write
This commit is contained in:
Levi Neely 2026-03-03 16:43:59 +01:00 committed by GitHub
parent 72ef56652d
commit d31b009acd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pclsync/prand.c
View File

@ -66,6 +66,7 @@ static void rehash_cnt(unsigned char *hashbin, unsigned long cnt) {
void prand_seed(unsigned char *seed, const void *addent, size_t aelen, void prand_seed(unsigned char *seed, const void *addent, size_t aelen,
int fast) { int fast) {
static unsigned char lastseed[PSYNC_LHASH_DIGEST_LEN]; static unsigned char lastseed[PSYNC_LHASH_DIGEST_LEN];
static pthread_mutex_t lastseed_mutex = PTHREAD_MUTEX_INITIALIZER;
psync_lhash_ctx hctx; psync_lhash_ctx hctx;
struct timespec tm; struct timespec tm;
struct stat st; struct stat st;
@ -160,6 +161,7 @@ void prand_seed(unsigned char *seed, const void *addent, size_t aelen,
if (aelen) if (aelen)
psync_lhash_update(&hctx, addent, aelen); psync_lhash_update(&hctx, addent, aelen);
pdbg_logf(D_NOTICE, "adding bulk data"); pdbg_logf(D_NOTICE, "adding bulk data");
pthread_mutex_lock(&lastseed_mutex);
for (i = 0; i < ARRAY_SIZE(lsc); i++) { for (i = 0; i < ARRAY_SIZE(lsc); i++) {
memcpy(&lsc[i], lastseed, PSYNC_LHASH_DIGEST_LEN); memcpy(&lsc[i], lastseed, PSYNC_LHASH_DIGEST_LEN);
for (j = 0; j < PSYNC_LHASH_DIGEST_LEN; j++) for (j = 0; j < PSYNC_LHASH_DIGEST_LEN; j++)
@ -176,6 +178,7 @@ void prand_seed(unsigned char *seed, const void *addent, size_t aelen,
} }
psync_lhash_final(seed, &hctx); psync_lhash_final(seed, &hctx);
memcpy(lastseed, seed, PSYNC_LHASH_DIGEST_LEN); memcpy(lastseed, seed, PSYNC_LHASH_DIGEST_LEN);
pthread_mutex_unlock(&lastseed_mutex);
pdbg_logf(D_NOTICE, "storing in db"); pdbg_logf(D_NOTICE, "storing in db");
psync_sql_res *res; psync_sql_res *res;