Skip to content

fix: heap-buffer-overflow READ in wolfSSL_i2c_ASN1_INTEGER via CRL revoked serial #10798

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
MarkAtwood wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

fix: heap-buffer-overflow READ in wolfSSL_i2c_ASN1_INTEGER via CRL revoked serial #10798

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
2 changes: 1 addition & 1 deletion src/ssl_asn1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,7 +1689,7 @@ int wolfSSL_i2c_ASN1_INTEGER(WOLFSSL_ASN1_INTEGER *a, unsigned char **pp)
}

/* Get length from DER encoding. */
if ((!err) && (GetLength_ex(a->data, &idx, &len, a->dataMax, 0) < 0)) {
if ((!err) && (GetLength_ex(a->data, &idx, &len, a->dataMax, 1) < 0)) {
err = 1;
}

Expand Down
11 changes: 8 additions & 3 deletions src/x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11013,16 +11013,21 @@ static WOLFSSL_X509_REVOKED* RevokedCertToRevoked(RevokedCert* rc, int seq)
return NULL;
}
if (rc->serialSz > 0 && rc->serialSz <= EXTERNAL_SERIAL_SIZE) {
serial->data = (unsigned char*)XMALLOC((size_t)rc->serialSz, NULL,
/* Allocate tag byte + length byte + content so that
* i2c_ASN1_INTEGER can read data[0] as tag and data[1] as length
* without overrunning the allocation. */
serial->data = (unsigned char*)XMALLOC((size_t)rc->serialSz + 2, NULL,
DYNAMIC_TYPE_OPENSSL);
if (serial->data == NULL) {
wolfSSL_ASN1_INTEGER_free(serial);
XFREE(rev, NULL, DYNAMIC_TYPE_OPENSSL);
return NULL;
}
XMEMCPY(serial->data, rc->serialNumber, (size_t)rc->serialSz);
serial->data[0] = ASN_INTEGER;
serial->data[1] = (unsigned char)rc->serialSz;
XMEMCPY(serial->data + 2, rc->serialNumber, (size_t)rc->serialSz);
serial->length = rc->serialSz;
serial->dataMax = rc->serialSz;
serial->dataMax = (word32)rc->serialSz + 2;
Comment on lines +11026 to +11030
serial->isDynamic = 1;
}
rev->serialNumber = serial;
Expand Down
Loading