security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-08 23:37:47 +02:00
Code Activity

Improve handling of random_seed read errors.

Browse Source 
* cipher/random.c (read_seed_file): Distinguish between errors and
short reads.
--

This should help to avoid program aborts due to races.  Nevertheless a
better and cross-platform locking would be a more solid solution.

GnuPG-bug-id: 1439
This commit is contained in:
Werner Koch 2012-11-07 18:06:27 +01:00
parent a74f05c32d
commit b1abc01d4a
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cipher/random.c
View File

@ -489,14 +489,38 @@ read_seed_file(void)
close(fd);
return 0;
}
do {
n = read( fd, buffer, POOLSIZE );
} while( n == -1 && errno == EINTR );
if( n != POOLSIZE ) {
/* The N==0, ENOENT, and N!=POOLSIZE cases may happen if another
process is updating the file. For consistency we use the same
recovery strategy as with the pre-read checks. */
if (!n) {
log_info(_("note: random_seed file is empty\n") );
allow_seed_file_update = 1;
close(fd);
return 0;
}
else if( n == -1 && errno == ENOENT) {
/* On a Unix system that should never happen. However, I can
imagine this error code on non-inode based systems. */
log_info(_("can't read `%s': %s\n"), seed_file_name, strerror(errno));
allow_seed_file_update = 1;
close(fd);
return 0;
}
else if( n == -1 ) {
/* A real read error. */
log_fatal(_("can't read `%s': %s\n"), seed_file_name,strerror(errno) );
close(fd);
return 0;
}
else if ( n != POOLSIZE ) {
log_info(_("WARNING: invalid size of random_seed file - not used\n") );
close(fd);
return 0;
}
close(fd);