rooty/yubico-pam
1
0
Fork 0
mirror of https://github.com/Yubico/yubico-pam.git synced 2025-02-12 06:54:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix a TOCTOU case when opening the debug_file

Browse Source 
This also unifies the code between pam-u2f and yubico-pam which means
removing the O_CREAT flag here. This is however in line with the README
and the behaviour of pam-u2f. Also, the previous code did lstat on the
path before and if it did not exist it would not have moved on to the
open() anyways.
This commit is contained in:
Gabriel Kihlman 2019-05-15 12:38:24 +02:00
parent 1c6fa66825
commit bec4e43732
No known key found for this signature in database
GPG Key ID: C59A56181B3BF1F7
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pam_yubico.c
View File

@ -790,6 +790,9 @@ restpriv_out:
static void static void
parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg) parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
{ {
struct stat st;
FILE *file = NULL;
int fd = -1;
int i; int i;
memset (cfg, 0, sizeof(struct cfg)); memset (cfg, 0, sizeof(struct cfg));
@ -879,24 +882,15 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
} }
else else
{ {
struct stat st; fd = open(filename, O_WRONLY | O_APPEND | O_CLOEXEC | O_NOFOLLOW | O_NOCTTY);
int fd; if (fd >= 0 && (fstat(fd, &st) == 0) && S_ISREG(st.st_mode))
FILE *file;
if(lstat(filename, &st) == 0)
{ {
if(S_ISREG(st.st_mode)) file = fdopen(fd, "a");
if(file != NULL)
{ {
fd = open(filename, O_WRONLY | O_CREAT | O_APPEND | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP); cfg->debug_file = file;
if (fd >= 0) file = NULL;
{ fd = -1;
file = fdopen(fd, "a");
if (file)
{
cfg->debug_file = file;
} else {
close(fd);
}
}
} }
} }
} }
@ -940,6 +934,12 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
DBG ("token_id_length=%u", cfg->token_id_length); DBG ("token_id_length=%u", cfg->token_id_length);
DBG ("mode=%s", cfg->mode == CLIENT ? "client" : "chresp" ); DBG ("mode=%s", cfg->mode == CLIENT ? "client" : "chresp" );
DBG ("chalresp_path=%s", cfg->chalresp_path ? cfg->chalresp_path : "(null)"); DBG ("chalresp_path=%s", cfg->chalresp_path ? cfg->chalresp_path : "(null)");
if (fd != -1)
close(fd);
if (file != NULL)
fclose(file);
} }
PAM_EXTERN int PAM_EXTERN int