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

Fix null pointer dereferences in PAM 

Coverity caught these.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13889
This commit is contained in:
Richard Yao 2022-09-16 17:02:54 -04:00 committed by GitHub
parent 6c8e9f09c2
commit 4df8ccc83d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -531,7 +531,6 @@ zfs_key_config_get_dataset(zfs_key_config_t *config)
if (zhp == NULL) { if (zhp == NULL) {
pam_syslog(NULL, LOG_ERR, "dataset %s not found", pam_syslog(NULL, LOG_ERR, "dataset %s not found",
config->homes_prefix); config->homes_prefix);
zfs_close(zhp);
return (NULL); return (NULL);
} }
@ -543,6 +542,10 @@ zfs_key_config_get_dataset(zfs_key_config_t *config)
return (dsname); return (dsname);
} }
if (config->homes_prefix == NULL) {
return (NULL);
}
size_t len = ZFS_MAX_DATASET_NAME_LEN; size_t len = ZFS_MAX_DATASET_NAME_LEN;
size_t total_len = strlen(config->homes_prefix) + 1 size_t total_len = strlen(config->homes_prefix) + 1
+ strlen(config->username); + strlen(config->username);