security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

kbx,w32: Try not to close the file when locking. 

* kbx/keybox-init.c (keybox_lock) [W32]: Close the file only if we
can't get the lock.
--

We try to avoid closing and re-opening a file.
This commit is contained in:
Werner Koch 2023-05-04 12:12:48 +02:00
parent 39f907cb00
commit b5716fef59
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
kbx/keybox-init.c
View File

@ -293,15 +293,46 @@ keybox_lock (KEYBOX_HANDLE hd, int yes, long timeout)
if (!kb->is_locked) if (!kb->is_locked)
{ {
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
/* Under Windows we need to close the file before we try /* Under Windows we need to close the file before we try to
* to lock it. This is because another process might have * lock it. This is because another process might have
* taken the lock and is using keybox_file_rename to * taken the lock and is using keybox_file_rename to rename
* rename the base file. Now if our dotlock_take below is * the base file. Now if our dotlock_take below is waiting
* waiting for the lock but we have the base file still * for the lock but we have the base file still open,
* open, keybox_file_rename will never succeed as we are * keybox_file_rename will never succeed as we are in a
* in a deadlock. */ * deadlock. Because closing a file should be avoided due
_keybox_close_file (hd); * to performance reasons we first try to take a lock and
#endif /*HAVE_W32_SYSTEM*/ * only if this fails we close the file and wait for the
* lock. */
if (timeout)
{
if (dotlock_take (kb->lockhd, 0))
{
/* Can't lock - close the file and wait for the lock. */
_keybox_close_file (hd);
if (dotlock_take (kb->lockhd, timeout))
{
err = gpg_error_from_syserror ();
log_info ("can't lock '%s'\n", kb->fname );
}
else
kb->is_locked = 1;
}
else
kb->is_locked = 1;
}
else if (dotlock_take (kb->lockhd, 0))
{
err = gpg_error_from_syserror ();
if (gpg_err_code (err) == GPG_ERR_EACCES)
; /* No diagnostic becuase we only tried to lock. */
else
log_info ("can't lock '%s'\n", kb->fname );
}
else
kb->is_locked = 1;
#else /*!HAVE_W32_SYSTEM*/
if (dotlock_take (kb->lockhd, timeout)) if (dotlock_take (kb->lockhd, timeout))
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
@ -312,6 +343,8 @@ keybox_lock (KEYBOX_HANDLE hd, int yes, long timeout)
} }
else else
kb->is_locked = 1; kb->is_locked = 1;
#endif /*!HAVE_W32_SYSTEM*/
} }
} }
else /* Release the lock. */ else /* Release the lock. */