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

kadmin: add_one_principal refactor

Browse Source 
If rand_password is true, allocate princ_name early to prevent
memory allocation errors after the principal was added.

Use memset_s to clear the 'password' so that it will not be
optimized away.

Change-Id: I80d11546166d2350e6a79c5a376cb9e8cb191fa3
This commit is contained in:
Jeffrey Altman
2022-01-21 00:44:10 -05:00
parent 912b20c4d7
commit 8dcc5e617b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kadmin/ank.c
View File

@@ -89,6 +89,7 @@ add_one_principal(const char *name,
int mask = 0;
int default_mask = 0;
char pwbuf[1024];
char *princ_name = NULL;
memset(&princ, 0, sizeof(princ));
ret = krb5_parse_name(context, name, &princ_ent);
@@ -96,6 +97,14 @@ add_one_principal(const char *name,
krb5_warn(context, ret, "krb5_parse_name");
return ret;
}
if (rand_password) {
ret = krb5_unparse_name(context, princ_ent, &princ_name);
if (ret) {
krb5_warn(context, ret, "krb5_parse_name");
goto out;
}
}
princ.principal = princ_ent;
mask |= KADM5_PRINCIPAL;
@@ -205,18 +214,17 @@ add_one_principal(const char *name,
kadm5_modify_principal(kadm_handle, &princ,
KADM5_PW_EXPIRATION | KADM5_ATTRIBUTES);
} else if (rand_password) {
char *princ_name;
krb5_unparse_name(context, princ_ent, &princ_name);
printf ("added %s with password \"%s\"\n", princ_name, password);
free (princ_name);
}
out:
free(princ_name);
kadm5_free_principal_ent(kadm_handle, &princ); /* frees princ_ent */
if(default_ent)
kadm5_free_principal_ent (kadm_handle, default_ent);
if (password != NULL)
memset (password, 0, strlen(password));
if (password != NULL) {
size_t len = strlen(password);
memset_s(password, len, 0, len);
}
return ret;
}