Skip to content

Fix UAF in callback wrapper and add input validation guards #10215

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

Draft
ColtonWilley wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −1
Draft

Fix UAF in callback wrapper and add input validation guards #10215

Show file tree
Hide file tree
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
9 changes: 8 additions & 1 deletion src/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8013,9 +8013,16 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
FreeTimeoutInfo(&ssl->timeoutInfo, ssl->heap);

if (hsCb) {
HandShakeInfo savedHandShakeInfo;
FinishHandShakeInfo(&ssl->handShakeInfo);
(hsCb)(&ssl->handShakeInfo);
XMEMCPY(&savedHandShakeInfo, &ssl->handShakeInfo,
sizeof(HandShakeInfo));
ssl->hsInfoOn = 0;
/* Null out the ssl pointer -- the callback must not free the
* session through it, and ssl may already have been freed by
* toCb above. */
savedHandShakeInfo.ssl = NULL;
(hsCb)(&savedHandShakeInfo);
}
return ret;
}
Expand Down
4 changes: 4 additions & 0 deletions wolfcrypt/src/cryptocb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,10 @@ int wc_CryptoCb_RegisterDevice(int devId, CryptoDevCallbackFunc cb, void* ctx)
{
int rc = 0;

if (devId == INVALID_DEVID) {
return BAD_FUNC_ARG;
}

/* find existing or new */
CryptoCb* dev = wc_CryptoCb_GetDevice(devId);
if (dev == NULL)
Expand Down
6 changes: 6 additions & 0 deletions wolfcrypt/src/memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,9 @@ int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,
if (pHint == NULL || buf == NULL || sizeList == NULL || distList == NULL) {
return BAD_FUNC_ARG;
}
if (listSz == 0) {
return BAD_FUNC_ARG;
}

/* Cap the listSz to the actual number of items allocated in the list. */
if (listSz > WOLFMEM_MAX_BUCKETS) {
Expand Down Expand Up @@ -831,6 +834,9 @@ int wolfSSL_StaticBufferSz_ex(unsigned int listSz,
if (buffer == NULL || sizeList == NULL || distList == NULL) {
return BAD_FUNC_ARG;
}
if (listSz == 0) {
return BAD_FUNC_ARG;
}

/* Cap the listSz to the actual number of items allocated in the list. */
if (listSz > WOLFMEM_MAX_BUCKETS) {
Expand Down
10 changes: 10 additions & 0 deletions wolfcrypt/src/wc_pkcs11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3694,6 +3694,8 @@ static int Pkcs11ECDSASig_Decode(const byte* in, word32 inSz, byte* sig,
ret = ASN_PARSE_E;
if (ret == 0 && (len = in[i++]) > sz + 1)
ret = ASN_PARSE_E;
if (ret == 0 && len == 0)
ret = ASN_PARSE_E;
/* Check there is space for INT data */
if (ret == 0 && i + len > inSz)
ret = ASN_PARSE_E;
Expand All @@ -3718,6 +3720,8 @@ static int Pkcs11ECDSASig_Decode(const byte* in, word32 inSz, byte* sig,
ret = ASN_PARSE_E;
if (ret == 0 && (len = in[i++]) > sz + 1)
ret = ASN_PARSE_E;
if (ret == 0 && len == 0)
ret = ASN_PARSE_E;
/* Check there is space for INT data */
if (ret == 0 && i + len > inSz)
ret = ASN_PARSE_E;
Expand Down Expand Up @@ -3762,6 +3766,12 @@ static int Pkcs11GetEccParams(Pkcs11Session* session, CK_OBJECT_HANDLE privKey,
ret = WC_HW_E;
}
PKCS11_DUMP_TEMPLATE("Ec Params", template, 1);
if (ret == 0) {
if (template[0].ulValueLen < 2 ||
template[0].ulValueLen > sizeof(oid)) {
ret = WC_HW_E;
}
}
if (ret == 0) {
/* PKCS #11 wraps the OID in ASN.1 */
curveId = wc_ecc_get_curve_id_from_oid(oid + 2,
Expand Down
Loading