security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-17 14:07:03 +01:00
Code Activity

g13: Allow the use of a g13tab label for --mount.

Browse Source 
* g13/mount.c (g13_mount_container): Do not run the first access check
if syshelp is required.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-08-14 20:23:12 +02:00
parent b781113cf1
commit f02ceb6c6e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g13/mount.c
View File

@ -60,10 +60,6 @@ g13_mount_container (ctrl_t ctrl, const char *filename, const char *mountpoint)
char *mountpoint_buffer = NULL; char *mountpoint_buffer = NULL;
char *blockdev_buffer = NULL; char *blockdev_buffer = NULL;
/* A quick check to see whether the container exists. */
if (access (filename, F_OK))
return gpg_error_from_syserror ();
/* Decide whether we need to use the g13-syshelp. */ /* Decide whether we need to use the g13-syshelp. */
err = call_syshelp_find_device (ctrl, filename, &blockdev_buffer); err = call_syshelp_find_device (ctrl, filename, &blockdev_buffer);
if (!err) if (!err)
@ -77,6 +73,12 @@ g13_mount_container (ctrl_t ctrl, const char *filename, const char *mountpoint)
filename, gpg_strerror (err), gpg_strsource (err)); filename, gpg_strerror (err), gpg_strsource (err));
return err; return err;
} }
else
{
/* A quick check to see whether we can the container exists. */
if (access (filename, R_OK))
return gpg_error_from_syserror ();
}
if (!mountpoint) if (!mountpoint)
{ {