Skip to content

pkcs11: bound the config file index in pkcs11_config_load_objects() #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
learnrahulrai-ui wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −12
Open

pkcs11: bound the config file index in pkcs11_config_load_objects() #428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions lib/pkcs11/pkcs11_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,21 +1078,32 @@ CK_RV pkcs11_config_load_objects(pkcs11_slot_ctx_ptr slot_ctx)
/* Configuration files must end with ".conf" */
if (0 == strcmp(&de->d_name[fn_len - 5u], ".conf"))
{
/* coverity[misra_c_2012_directive_4_12_violation] Standard library functions are required */
/* coverity[misra_c_2012_rule_21_3_violation] Standard library functions are required */
updateConfFileData[i] = (pkcs11_conf_filedata*)malloc(sizeof(pkcs11_conf_filedata));

if (NULL != updateConfFileData[i])
if (MAX_CONF_FILES <= i)
{
/* More configuration files than updateConfFileData
can hold. Report it rather than silently ignoring
the remainder, which files get ignored would
otherwise depend on readdir() order. */
rv = CKR_HOST_MEMORY;
}
else
{
(void)strcpy(updateConfFileData[i]->filename, de->d_name);
updateConfFileData[i]->initialized = false;
/* coverity[misra_c_2012_directive_4_12_violation] Standard library functions are required */
/* coverity[misra_c_2012_rule_21_3_violation] Standard library functions are required */
updateConfFileData[i] = (pkcs11_conf_filedata*)malloc(sizeof(pkcs11_conf_filedata));

if (UINT8_MAX > totalConfFileCount)
if (NULL != updateConfFileData[i])
{
totalConfFileCount++;
(void)strcpy(updateConfFileData[i]->filename, de->d_name);
updateConfFileData[i]->initialized = false;

if (UINT8_MAX > totalConfFileCount)
{
totalConfFileCount++;
}
i++;
}
}
i++;
}
}
}
Expand All @@ -1111,7 +1122,7 @@ CK_RV pkcs11_config_load_objects(pkcs11_slot_ctx_ptr slot_ctx)

argc = sizeof(argv) / sizeof(argv[0]);
/* First parse base file and then parse handle files if present*/
while (NULL != updateConfFileData[i])
while ((totalConfFileCount > i) && (NULL != updateConfFileData[i]))
{
size_t fileName_len = strlen(updateConfFileData[i]->filename);
(void)memcpy((void*)fileName_tmp, (const void*)updateConfFileData[i]->filename, sizeof(updateConfFileData[i]->filename));
Expand Down Expand Up @@ -1362,7 +1373,7 @@ CK_RV pkcs11_config_load_objects(pkcs11_slot_ctx_ptr slot_ctx)
i++;
}

for (i = 0; NULL != updateConfFileData[i]; i++)
for (i = 0; (totalConfFileCount > i) && (NULL != updateConfFileData[i]); i++)
{
pkcs11_os_free(updateConfFileData[i]);
}
Expand Down