sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

auth:kerberos: Fix resource leak in smb_krb5_get_keytab_container()

Browse Source 
Reported by Red Hat internal covscan
leaked_storage: Variable "keytab" going out of scope leaks the storage it points to.

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Pavel Filipenský 2023-07-26 16:28:36 +02:00 committed by Stefan Metzmacher
parent dfc26dc494
commit f1356805ba
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source4/auth/kerberos/kerberos_util.c
View File

@ -468,6 +468,21 @@ krb5_error_code smb_krb5_get_keytab_container(TALLOC_CTX *mem_ctx,
krb5_keytab keytab;
krb5_error_code ret;
/*
* Start with talloc(), talloc_reference() and only then call
* krb5_kt_resolve(). If any of them fails, the cleanup code is simpler.
*/
*ktc = talloc(mem_ctx, struct keytab_container);
if (!*ktc) {
return ENOMEM;
}
(*ktc)->smb_krb5_context = talloc_reference(*ktc, smb_krb5_context);
if ((*ktc)->smb_krb5_context == NULL) {
TALLOC_FREE(*ktc);
return ENOMEM;
}
if (opt_keytab) {
keytab = opt_keytab;
} else {
@ -478,16 +493,11 @@ krb5_error_code smb_krb5_get_keytab_container(TALLOC_CTX *mem_ctx,
smb_get_krb5_error_message(
smb_krb5_context->krb5_context,
ret, mem_ctx)));
TALLOC_FREE(*ktc);
return ret;
}
}
*ktc = talloc(mem_ctx, struct keytab_container);
if (!*ktc) {
return ENOMEM;
}
(*ktc)->smb_krb5_context = talloc_reference(*ktc, smb_krb5_context);
(*ktc)->keytab = keytab;
(*ktc)->password_based = false;
talloc_set_destructor(*ktc, free_keytab_container);