diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2013-02-08 15:04:26 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2013-02-08 15:04:26 +0100 |
| commit | 8dc056c1c8bc7acb66c4decc49add2c3a24e6310 (patch) | |
| tree | 6bc6ebe09731ee52e67ecd702d2f4834221f15d9 /modules/pam_unix/bigcrypt.c | |
| parent | e2a818773f96d12fc9f91bf2792a5a216c3b9aa4 (diff) | |
| download | pam-8dc056c1c8bc7acb66c4decc49add2c3a24e6310.tar.gz pam-8dc056c1c8bc7acb66c4decc49add2c3a24e6310.tar.bz2 pam-8dc056c1c8bc7acb66c4decc49add2c3a24e6310.zip | |
Add checks for crypt() returning NULL.
modules/pam_pwhistory/opasswd.c (compare_password): Add check for crypt() NULL return.
modules/pam_unix/bigcrypt.c (bigcrypt): Likewise.
Diffstat (limited to 'modules/pam_unix/bigcrypt.c')
| -rw-r--r-- | modules/pam_unix/bigcrypt.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/pam_unix/bigcrypt.c b/modules/pam_unix/bigcrypt.c index e10d1c56..e1d57a07 100644 --- a/modules/pam_unix/bigcrypt.c +++ b/modules/pam_unix/bigcrypt.c @@ -109,6 +109,10 @@ char *bigcrypt(const char *key, const char *salt) #else tmp_ptr = crypt(plaintext_ptr, salt); /* libc crypt() */ #endif + if (tmp_ptr == NULL) { + free(dec_c2_cryptbuf); + return NULL; + } /* and place in the static area */ strncpy(cipher_ptr, tmp_ptr, 13); cipher_ptr += ESEGMENT_SIZE + SALT_SIZE; @@ -130,6 +134,11 @@ char *bigcrypt(const char *key, const char *salt) #else tmp_ptr = crypt(plaintext_ptr, salt_ptr); #endif + if (tmp_ptr == NULL) { + _pam_overwrite(dec_c2_cryptbuf); + free(dec_c2_cryptbuf); + return NULL; + } /* skip the salt for seg!=0 */ strncpy(cipher_ptr, (tmp_ptr + SALT_SIZE), ESEGMENT_SIZE); |