security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Use is_secured_filename before opening the file.

Browse Source 
* g10/gpg.c (print_mds): Check by is_secured_filename, earlier.
* g10/tdbdump.c (import_ownertrust): Likewise.

--

GnuPG-bug-id: 6508
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-07-14 15:49:23 +09:00
parent cf270b0d30
commit 5d375bb168
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/gpg.c
View File

@ -5622,13 +5622,13 @@ print_mds( const char *fname, int algo )
} }
else else
{ {
fp = es_fopen (fname, "rb" ); if (is_secured_filename (fname))
if (fp && is_secured_file (es_fileno (fp)))
{ {
es_fclose (fp);
fp = NULL; fp = NULL;
gpg_err_set_errno (EPERM); gpg_err_set_errno (EPERM);
} }
else
fp = es_fopen (fname, "rb" );
} }
if (!fp) if (!fp)
{ {

13
g10/tdbdump.c
View File

@ -141,19 +141,16 @@ import_ownertrust (ctrl_t ctrl, const char *fname )
fname = "[stdin]"; fname = "[stdin]";
is_stdin = 1; is_stdin = 1;
} }
else if (is_secured_filename (fname)) {
gpg_err_set_errno (EPERM);
log_error (_("can't open '%s': %s\n"), fname, strerror(errno) );
return;
}
else if( !(fp = es_fopen( fname, "r" )) ) { else if( !(fp = es_fopen( fname, "r" )) ) {
log_error ( _("can't open '%s': %s\n"), fname, strerror(errno) ); log_error ( _("can't open '%s': %s\n"), fname, strerror(errno) );
return; return;
} }
if (is_secured_file (es_fileno (fp)))
{
es_fclose (fp);
gpg_err_set_errno (EPERM);
log_error (_("can't open '%s': %s\n"), fname, strerror(errno) );
return;
}
while (es_fgets (line, DIM(line)-1, fp)) { while (es_fgets (line, DIM(line)-1, fp)) {
TRUSTREC rec; TRUSTREC rec;