Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

PAM: Fix unchecked return value from zfs_key_config_load() 

9a49c6b782 was intended to fix this issue,
but I had missed the case in pam_sm_open_session(). Clang's static
analyzer had not reported it and I forgot to look for other cases.

Interestingly, GCC gcc-12.1.1_p20220625's static analyzer had caught
this as multiple double-free bugs, since another failure after the
failure in zfs_key_config_load() will cause us to attempt to free the
memory that zfs_key_config_load() was supposed to allocate, but had
cleaned up upon failure.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13978
This commit is contained in:
Richard Yao 2022-10-05 20:09:24 -04:00 committed by Tony Hutter
parent c562bbefc0
commit fa74250cd3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pam_zfs_key/pam_zfs_key.c
View File

@ -714,7 +714,10 @@ pam_sm_open_session(pam_handle_t *pamh, int flags,
return (PAM_SUCCESS); return (PAM_SUCCESS);
} }
zfs_key_config_t config; zfs_key_config_t config;
zfs_key_config_load(pamh, &config, argc, argv); if (zfs_key_config_load(pamh, &config, argc, argv) != 0) {
return (PAM_SESSION_ERR);
}
if (config.uid < 1000) { if (config.uid < 1000) {
zfs_key_config_free(&config); zfs_key_config_free(&config);
return (PAM_SUCCESS); return (PAM_SUCCESS);