Skip to content

cupsfilters: ieee1284: fix out-of-bounds read in NormalizeMakeModel #139

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
tillkamppeter merged 1 commit into from
Mar 25, 2026
Merged

cupsfilters: ieee1284: fix out-of-bounds read in NormalizeMakeModel #139

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
44 changes: 38 additions & 6 deletions cupsfilters/ieee1284.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,13 +845,18 @@ cfIEEE1284NormalizeMakeModel(
//

modelptr = buffer + (make - make_and_model);
else if (!strncasecmp(buffer, make, strlen(make)) &&
else if (strlen(make) < bufsize &&
!strncasecmp(buffer, make, strlen(make)) &&
isspace(buffer[strlen(make)]))
{
//
// User-supplied make string matches start of input
//

modelptr = buffer + strlen(make) + 1;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else
{
//
Expand All @@ -860,6 +865,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "%s %s", make, make_and_model);
modelptr = buffer + strlen(make) + 1;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
}

Expand All @@ -880,6 +887,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "Xerox %s", make_and_model);
modelptr = buffer + 6;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "Eastman", 7))
{
Expand All @@ -889,6 +898,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "Kodak %s", make_and_model + 7);
modelptr = buffer + 6;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "laserwriter", 11))
{
Expand All @@ -898,6 +909,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "Apple LaserWriter%s", make_and_model + 11);
modelptr = buffer + 6;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "colorpoint", 10))
{
Expand All @@ -907,6 +920,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "Seiko %s", make_and_model);
modelptr = buffer + 6;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "fiery", 5))
{
Expand All @@ -916,6 +931,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "EFI %s", make_and_model);
modelptr = buffer + 4;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "ps ", 3) ||
!strncasecmp(make_and_model, "colorpass", 9))
Expand All @@ -926,6 +943,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "Canon %s", make_and_model);
modelptr = buffer + 6;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "primera", 7))
{
Expand All @@ -935,6 +954,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "Fargo %s", make_and_model);
modelptr = buffer + 6;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "designjet", 9) ||
!strncasecmp(make_and_model, "deskjet", 7) ||
Expand All @@ -947,6 +968,8 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "HP %s", make_and_model);
modelptr = buffer + 3;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}
else if (!strncasecmp(make_and_model, "ecosys", 6))
{
Expand All @@ -956,22 +979,28 @@ cfIEEE1284NormalizeMakeModel(

snprintf(buffer, bufsize, "Kyocera %s", make_and_model);
modelptr = buffer + 8;
if (modelptr >= buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);
}

//
// Known make names with space
//

else if (strncasecmp(buffer, "konica minolta", 14) &&
else if (strlen(buffer) >= 15 &&
strncasecmp(buffer, "konica minolta", 14) &&
isspace(buffer[14]))
modelptr = buffer + 15;
else if (strncasecmp(buffer, "fuji xerox", 10) &&
else if (strlen(buffer) >= 11 &&
strncasecmp(buffer, "fuji xerox", 10) &&
isspace(buffer[10]))
modelptr = buffer + 11;
else if (strncasecmp(buffer, "lexmark international", 21) &&
else if (strlen(buffer) >= 22 &&
strncasecmp(buffer, "lexmark international", 21) &&
isspace(buffer[21]))
modelptr = buffer + 22;
else if (strncasecmp(buffer, "kyocera mita", 12) &&
else if (strlen(buffer) >= 13 &&
strncasecmp(buffer, "kyocera mita", 12) &&
isspace(buffer[12]))
modelptr = buffer + 13;

Expand All @@ -991,6 +1020,9 @@ cfIEEE1284NormalizeMakeModel(
// Adjust modelptr to the actual start of the model name
//

if (modelptr && modelptr > buffer + strlen(buffer))
modelptr = buffer + strlen(buffer);

if (modelptr)
while (!isalnum(*modelptr) && *modelptr != '\0')
modelptr ++;
Expand Down Expand Up @@ -1346,4 +1378,4 @@ cfIEEE1284NormalizeMakeModel(
if (extra) *extra = extraptr;
if (drvname) *drvname = drvptr;
return (buffer[0] ? buffer : NULL);
}
}
Loading