Skip to content

fix out-of-bounds read in cupsSignCredentialsRequest #1640

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
aizu-m wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix out-of-bounds read in cupsSignCredentialsRequest #1640

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
8 changes: 6 additions & 2 deletions cups/tls-openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ cupsSignCredentialsRequest(

for (purpose = 0, j = 4; j < datalen; j += data[j + 1] + 2)
{
if (data[j] != 0x06 || data[j + 1] != 8 || memcmp(data + j + 2, "+\006\001\005\005\007\003", 7))
if ((j + 2) > datalen || (j + 2 + data[j + 1]) > datalen || data[j] != 0x06 || data[j + 1] != 8 || memcmp(data + j + 2, "+\006\001\005\005\007\003", 7))
{
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad keyUsage extension in X.509 certificate request."), 1);
goto done;
Expand Down Expand Up @@ -1331,8 +1331,12 @@ cupsSignCredentialsRequest(
}

// Parse the SAN values (there should be an easier/standard OpenSSL API to do this!)
for (j = 4, datalen -= 2; j < datalen; j += data[j + 1] + 2)
for (j = 4; j < datalen; j += data[j + 1] + 2)
{
// Stop if the element header or value runs past the extension data...
if ((j + 2) > datalen || (j + 2 + data[j + 1]) > datalen)
break;

if (data[j] == 0x82 && data[j + 1])
{
// GENERAL_STRING for DNS
Expand Down
Loading