Skip to content

fix: Fix logic in prvAddObjectToList #178

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

Merged
merged 3 commits into from
Jun 26, 2023
Merged

fix: Fix logic in prvAddObjectToList #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7cbd39
fix: Fix logic in prvAddObjectToList
paulbartell May 31, 2023
0f6e327
mbedtls_integration: Skip coverage instrumentation
paulbartell Jun 26, 2023
4783a14
pkcs11_mbedtls_utest: add prvAddObjectToList case
paulbartell Jun 26, 2023
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
70 changes: 39 additions & 31 deletions source/portable/mbedtls/core_pkcs11_mbedtls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ static CK_RV prvDeleteObjectFromList( CK_OBJECT_HANDLE xPalHandle )
{
CK_RV xResult = CKR_OK;
int32_t lGotSemaphore = ( int32_t ) 0;
uint32_t ulIndex = 0;
CK_ULONG ulIndex;

lGotSemaphore = mbedtls_mutex_lock( &xP11Context.xObjectList.xMutex );

Expand Down Expand Up @@ -1187,49 +1187,57 @@ static CK_RV prvAddObjectToList( CK_OBJECT_HANDLE xPalHandle,
{
CK_RV xResult = CKR_HOST_MEMORY;

/* MISRA Ref 10.5.1 [Essential type casting] */
/* More details at: https://github.com/FreeRTOS/corePKCS11/blob/main/MISRA.md#rule-105 */
/* coverity[misra_c_2012_rule_10_5_violation] */
CK_BBOOL xObjectFound = ( CK_BBOOL ) CK_FALSE;
uint32_t ulSearchIndex = 0;

if( 0 == mbedtls_mutex_lock( &xP11Context.xObjectList.xMutex ) )
if( xLabelLength > pkcs11configMAX_LABEL_LENGTH )
{
xResult = CKR_ARGUMENTS_BAD;
LogError( ( "Failed to add object to internal object list: "
"xLabelLength exceeds pkcs11configMAX_LABEL_LENGTH." ) );
}
else if( 0 == mbedtls_mutex_lock( &xP11Context.xObjectList.xMutex ) )
{
CK_ULONG ulSearchIndex;
CK_ULONG ulEmptyIndex = 0;
P11Object_t * pxEmptyP11Object = NULL;

/* Iterate over list to find an existing entry containing xPalHandle */
for( ulSearchIndex = 0; ulSearchIndex < pkcs11configMAX_NUM_OBJECTS; ulSearchIndex++ )
{
if( xResult == CKR_OK )
{
break;
}
P11Object_t * pxP11Object = &( xP11Context.xObjectList.xObjects[ ulSearchIndex ] );

if( xP11Context.xObjectList.xObjects[ ulSearchIndex ].xHandle == xPalHandle )
{
/* Object already exists in list. */
/* MISRA Ref 10.5.1 [Essential type casting] */
/* More details at: https://github.com/FreeRTOS/corePKCS11/blob/main/MISRA.md#rule-105 */
/* coverity[misra_c_2012_rule_10_5_violation] */
xResult = CKR_OK;
xObjectFound = ( CK_BBOOL ) CK_TRUE;
}
else if( xP11Context.xObjectList.xObjects[ ulSearchIndex ].xHandle == CK_INVALID_HANDLE )
/* Update an existing entry with the desired xPalHandle */
if( pxP11Object->xHandle == xPalHandle )
{
( void ) memcpy( pxP11Object->xLabel, pcLabel, xLabelLength );
pxP11Object->xLabelSize = xLabelLength;

xResult = CKR_OK;
*pxAppHandle = ulSearchIndex + 1;

/* Entry updated, so exit the loop. */
break;
}
else
{
/* Cannot find a free object. */
if( ( pxP11Object->xHandle == CK_INVALID_HANDLE ) &&
( pxEmptyP11Object == NULL ) )
{
pxEmptyP11Object = pxP11Object;
ulEmptyIndex = ulSearchIndex;
}
}
}

/* MISRA Ref 10.5.1 [Essential type casting] */
/* More details at: https://github.com/FreeRTOS/corePKCS11/blob/main/MISRA.md#rule-105 */
/* coverity[misra_c_2012_rule_10_5_violation] */
if( ( xResult == CKR_OK ) && ( xObjectFound == ( CK_BBOOL ) CK_FALSE ) && ( xLabelLength <= pkcs11configMAX_LABEL_LENGTH ) )
/* Check if we have reached the end of the list without writing */
if( ( xResult != CKR_OK ) &&
( pxEmptyP11Object != NULL ) )
{
xP11Context.xObjectList.xObjects[ ulSearchIndex - 1UL ].xHandle = xPalHandle;
( void ) memcpy( xP11Context.xObjectList.xObjects[ ulSearchIndex - 1UL ].xLabel, pcLabel, xLabelLength );
xP11Context.xObjectList.xObjects[ ulSearchIndex - 1UL ].xLabelSize = xLabelLength;
*pxAppHandle = ulSearchIndex;
pxEmptyP11Object->xHandle = xPalHandle;
pxEmptyP11Object->xLabelSize = xLabelLength;

( void ) memcpy( pxEmptyP11Object->xLabel, pcLabel, xLabelLength );

*pxAppHandle = ulEmptyIndex + 1;
xResult = CKR_OK;
}

( void ) mbedtls_mutex_unlock( &xP11Context.xObjectList.xMutex );
Expand Down
2 changes: 0 additions & 2 deletions test/mbedtls_integration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ target_link_libraries(target_lib INTERFACE pkcs11_api)

add_library(target_lib_mb2 STATIC)
target_link_libraries(target_lib_mb2 PRIVATE target_lib MbedTLS2::mbedcrypto)
target_enable_gcov(target_lib_mb2 PRIVATE)

add_library(target_lib_mb3 STATIC)
target_link_libraries(target_lib_mb3 PRIVATE target_lib MbedTLS3::mbedcrypto)
target_enable_gcov(target_lib_mb3 PRIVATE)

add_library(mbedtls_test INTERFACE)
target_sources(mbedtls_test INTERFACE mbedtls_integration_test.c INTERFACE "${PKCS_PAL_POSIX_SOURCES}")
Expand Down
Loading