arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-24 23:48:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4162 from magnumripper/robust-lock

Browse Source 
Recover from (rare) non-fatal file locking problems
This commit is contained in:
Jens Steube 2025-05-28 20:47:56 +02:00 committed by GitHub
commit 4df5e4517d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/locking.c
View File

@ -20,9 +20,18 @@ int hc_lockfile (HCFILE *fp)
lock.l_type = F_WRLCK; lock.l_type = F_WRLCK;
/* Needs this loop because a signal may interrupt a wait for lock */
while (fcntl (fp->fd, F_SETLKW, &lock)) while (fcntl (fp->fd, F_SETLKW, &lock))
{ {
// These shouldn't happen with F_SETLKW yet are (rarely) seen IRL. Recoverable!
if (errno == EAGAIN || errno == ENOLCK)
{
struct timeval tv = { .tv_sec = 0, .tv_usec = 10000 };
select (0, NULL, NULL, NULL, &tv);
continue;
}
// A signal may interrupt a wait for lock with EINTR. Anything else is fatal
if (errno != EINTR) return -1; if (errno != EINTR) return -1;
} }