security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

g10: Make sure to have the directory for trustdb.

Browse Source 
* g10/tdbio.c (tdbio_set_dbname): Return earlier if !CREATE.  Check
the directory and create it if none before calling take_write_lock.

--

Thanks to Marc Deslauriers for the bug report and his patch.

GnuPG-bug-id: 2246

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

(backport from master
 commit 2f3e42047d17313eeb38d354048f343158402a8d)
This commit is contained in:
NIIBE Yutaka 2016-02-12 10:00:31 +09:00
parent 22caa5c2d4
commit d957e4388f
1 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
g10/tdbio.c
View File

@ -477,7 +477,7 @@ create_version_record (void)
int int
tdbio_set_dbname( const char *new_dbname, int create, int *r_nofile) tdbio_set_dbname( const char *new_dbname, int create, int *r_nofile)
{ {
char *fname; char *fname, *p;
struct stat statbuf; struct stat statbuf;
static int initialized = 0; static int initialized = 0;
@ -512,57 +512,64 @@ tdbio_set_dbname( const char *new_dbname, int create, int *r_nofile)
if (stat (fname, &statbuf) == 0 && statbuf.st_size > 0) if (stat (fname, &statbuf) == 0 && statbuf.st_size > 0)
/* OK, we have the valid trustdb.gpg already. */ /* OK, we have the valid trustdb.gpg already. */
return 0; return 0;
else if (!create) {
*r_nofile = 1;
return 0;
}
/* Here comes: No valid trustdb.gpg AND CREATE==1 */
/*
* Make sure the directory exists. This should be done before
* acquiring the lock, which assumes the directory existence.
*/
p = strrchr( fname, DIRSEP_C );
assert(p); /* See the code above. Always, it has DIRSEP_C. */
*p = 0;
if( access( fname, F_OK ) ) {
try_make_homedir( fname );
if (access (fname, F_OK ))
log_fatal (_("%s: directory does not exist!\n"), p);
}
*p = DIRSEP_C;
take_write_lock (); take_write_lock ();
/* Check the file after aquiring the lock. */
if( access( fname, R_OK ) ) { if( access( fname, R_OK ) ) {
FILE *fp;
TRUSTREC rec;
int rc;
mode_t oldmask;
if( errno != ENOENT ) if( errno != ENOENT )
log_fatal( _("can't access `%s': %s\n"), fname, strerror(errno) ); log_fatal( _("can't access `%s': %s\n"), fname, strerror(errno) );
if (!create) oldmask=umask(077);
*r_nofile = 1; if (is_secured_filename (fname)) {
else { fp = NULL;
FILE *fp; errno = EPERM;
TRUSTREC rec; }
int rc; else
char *p = strrchr( fname, DIRSEP_C ); fp =fopen( fname, "wb" );
mode_t oldmask; umask(oldmask);
if( !fp )
log_fatal( _("can't create `%s': %s\n"), fname, strerror(errno) );
fclose(fp);
db_fd = open( db_name, O_RDWR | MY_O_BINARY );
if( db_fd == -1 )
log_fatal( _("can't open `%s': %s\n"), db_name, strerror(errno) );
assert(p); rc = create_version_record ();
*p = 0; if( rc )
if( access( fname, F_OK ) ) { log_fatal( _("%s: failed to create version record: %s"),
try_make_homedir( fname ); fname, g10_errstr(rc));
if (access (fname, F_OK )) /* and read again to check that we are okay */
log_fatal (_("%s: directory does not exist!\n"), fname); if( tdbio_read_record( 0, &rec, RECTYPE_VER ) )
} log_fatal( _("%s: invalid trustdb created\n"), db_name );
*p = DIRSEP_C;
oldmask=umask(077); if( !opt.quiet )
if (is_secured_filename (fname)) { log_info(_("%s: trustdb created\n"), db_name);
fp = NULL;
errno = EPERM;
}
else
fp =fopen( fname, "wb" );
umask(oldmask);
if( !fp )
log_fatal( _("can't create `%s': %s\n"), fname, strerror(errno) );
fclose(fp);
db_fd = open( db_name, O_RDWR | MY_O_BINARY );
if( db_fd == -1 )
log_fatal( _("can't open `%s': %s\n"), db_name, strerror(errno) );
rc = create_version_record ();
if( rc )
log_fatal( _("%s: failed to create version record: %s"),
fname, g10_errstr(rc));
/* and read again to check that we are okay */
if( tdbio_read_record( 0, &rec, RECTYPE_VER ) )
log_fatal( _("%s: invalid trustdb created\n"), db_name );
if( !opt.quiet )
log_info(_("%s: trustdb created\n"), db_name);
}
} }
release_write_lock (); release_write_lock ();