Skip to content

fix misaligned access when reading PKCS#11 attributes #865

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
citypw wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −16
Open

fix misaligned access when reading PKCS#11 attributes #865

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
43 changes: 27 additions & 16 deletions src/lib/SoftHSM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,36 +240,41 @@ static CK_RV extractObjectInformation(CK_ATTRIBUTE_PTR pTemplate,
switch (pTemplate[i].type)
{
case CKA_CLASS:
if (pTemplate[i].ulValueLen == sizeof(CK_OBJECT_CLASS))
if (pTemplate[i].ulValueLen == sizeof(CK_OBJECT_CLASS) &&
pTemplate[i].pValue != NULL_PTR)
{
memcpy(&objClass, pTemplate[i].pValue, sizeof(objClass));
bHasClass = true;
}
break;
case CKA_KEY_TYPE:
if (pTemplate[i].ulValueLen == sizeof(CK_KEY_TYPE))
if (pTemplate[i].ulValueLen == sizeof(CK_KEY_TYPE) &&
pTemplate[i].pValue != NULL_PTR)
{
keyType = *(CK_KEY_TYPE*)pTemplate[i].pValue;
memcpy(&keyType, pTemplate[i].pValue, sizeof(keyType));
bHasKeyType = true;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
break;
case CKA_CERTIFICATE_TYPE:
if (pTemplate[i].ulValueLen == sizeof(CK_CERTIFICATE_TYPE))
if (pTemplate[i].ulValueLen == sizeof(CK_CERTIFICATE_TYPE) &&
pTemplate[i].pValue != NULL_PTR)
{
certType = *(CK_CERTIFICATE_TYPE*)pTemplate[i].pValue;
memcpy(&certType, pTemplate[i].pValue, sizeof(certType));
bHasCertType = true;
}
break;
case CKA_TOKEN:
if (pTemplate[i].ulValueLen == sizeof(CK_BBOOL))
if (pTemplate[i].ulValueLen == sizeof(CK_BBOOL) &&
pTemplate[i].pValue != NULL_PTR)
{
isOnToken = *(CK_BBOOL*)pTemplate[i].pValue;
memcpy(&isOnToken, pTemplate[i].pValue, sizeof(isOnToken));
}
break;
case CKA_PRIVATE:
if (pTemplate[i].ulValueLen == sizeof(CK_BBOOL))
if (pTemplate[i].ulValueLen == sizeof(CK_BBOOL) &&
pTemplate[i].pValue != NULL_PTR)
{
isPrivate = *(CK_BBOOL*)pTemplate[i].pValue;
memcpy(&isPrivate, pTemplate[i].pValue, sizeof(isPrivate));
bHasPrivate = true;
}
break;
Expand Down Expand Up @@ -1711,14 +1716,16 @@ CK_RV SoftHSM::C_CopyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject

for (CK_ULONG i = 0; i < ulCount; i++)
{
if ((pTemplate[i].type == CKA_TOKEN) && (pTemplate[i].ulValueLen == sizeof(CK_BBOOL)))
if ((pTemplate[i].type == CKA_TOKEN) && (pTemplate[i].ulValueLen == sizeof(CK_BBOOL)) &&
(pTemplate[i].pValue != NULL_PTR))
{
isOnToken = *(CK_BBOOL*)pTemplate[i].pValue;
memcpy(&isOnToken, pTemplate[i].pValue, sizeof(isOnToken));
continue;
}
if ((pTemplate[i].type == CKA_PRIVATE) && (pTemplate[i].ulValueLen == sizeof(CK_BBOOL)))
if ((pTemplate[i].type == CKA_PRIVATE) && (pTemplate[i].ulValueLen == sizeof(CK_BBOOL)) &&
(pTemplate[i].pValue != NULL_PTR))
{
isPrivate = *(CK_BBOOL*)pTemplate[i].pValue;
memcpy(&isPrivate, pTemplate[i].pValue, sizeof(isPrivate));
continue;
}
}
Expand Down Expand Up @@ -2080,17 +2087,21 @@ CK_RV SoftHSM::C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pT

if (attr.isBooleanAttribute())
{
if (sizeof(CK_BBOOL) != pTemplate[i].ulValueLen)
if (sizeof(CK_BBOOL) != pTemplate[i].ulValueLen ||
pTemplate[i].pValue == NULL_PTR)
break;
bool bTemplateValue = (*(CK_BBOOL*)pTemplate[i].pValue == CK_TRUE);
CK_BBOOL b = CK_FALSE;
memcpy(&b, pTemplate[i].pValue, sizeof(b));
bool bTemplateValue = (b == CK_TRUE);
if (attr.getBooleanValue() != bTemplateValue)
break;
}
else
{
if (attr.isUnsignedLongAttribute())
{
if (sizeof(CK_ULONG) != pTemplate[i].ulValueLen)
if (sizeof(CK_ULONG) != pTemplate[i].ulValueLen ||
pTemplate[i].pValue == NULL_PTR)
break;
CK_ULONG ulTemplateValue;
memcpy(&ulTemplateValue, pTemplate[i].pValue, sizeof(ulTemplateValue));
Expand Down
Loading