oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

krb5: Fix NULL deref on ENOMEM in fkt_add_entry()

Browse Source
This commit is contained in:
Nicolas Williams
2020-09-14 16:38:20 -05:00
parent 821dcaec70
commit 096888fe31
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/krb5/keytab_file.c
View File

@@ -543,9 +543,9 @@ fkt_add_entry(krb5_context context,
krb5_data keytab; krb5_data keytab;
int32_t len; int32_t len;
fd = open (d->filename, O_RDWR | O_BINARY | O_CLOEXEC); fd = open(d->filename, O_RDWR | O_BINARY | O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
fd = open (d->filename, O_RDWR | O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC, 0600); fd = open(d->filename, O_RDWR | O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC, 0600);
if (fd < 0) { if (fd < 0) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
@@ -561,9 +561,13 @@ fkt_add_entry(krb5_context context,
return ret; return ret;
} }
sp = krb5_storage_stdio_from_fd(fd, "wb+"); sp = krb5_storage_stdio_from_fd(fd, "wb+");
if (sp == NULL) {
close(fd);
return krb5_enomem(context);
}
krb5_storage_set_eof_code(sp, KRB5_KT_END); krb5_storage_set_eof_code(sp, KRB5_KT_END);
ret = fkt_setup_keytab(context, id, sp); ret = fkt_setup_keytab(context, id, sp);
if(ret) { if (ret) {
goto out; goto out;
} }
storage_set_flags(context, sp, id->version); storage_set_flags(context, sp, id->version);