rpms/cups
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added upstream patch to fix 100% cpu usage regression (https://github.com/apple/cups/issues/5325) [release 2.2.8-2mamba;Tue Jun 12 2018]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 21:35:03 +01:00
parent 8bd20fcae9
commit d1f63ce3db
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cups-2.2.8-fix-balidation-rejecting-all-names.patch Normal file
View File

@ -0,0 +1,60 @@
From 455c52a027ab3548953372a0b7bdb0008420e9ba Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Fri, 8 Jun 2018 22:29:50 +0200
Subject: [PATCH] Fix validation rejecting all NAME and TEXT attrs
When the UTF-8 validation loop finishes successfully, `*ptr` points at
the `'\0'` at the end of the string. The code misinterpreted this as a
control character (`*ptr < ' '`) and failed the validation.
Fixes https://github.com/apple/cups/issues/5325
---
cups/ipp.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/cups/ipp.c b/cups/ipp.c
index 95d53cc44..204c71fcd 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -5030,15 +5030,13 @@ ippValidateAttribute(
else if (*ptr & 0x80)
break;
else if ((*ptr < ' ' && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') || *ptr == 0x7f)
- break;
+ {
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
+ return (0);
+ }
}
- if (*ptr < ' ' || *ptr == 0x7f)
- {
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
- return (0);
- }
- else if (*ptr)
+ if (*ptr)
{
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
return (0);
@@ -5088,15 +5086,13 @@ ippValidateAttribute(
else if (*ptr & 0x80)
break;
else if (*ptr < ' ' || *ptr == 0x7f)
- break;
+ {
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
+ return (0);
+ }
}
- if (*ptr < ' ' || *ptr == 0x7f)
- {
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
- return (0);
- }
- else if (*ptr)
+ if (*ptr)
{
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
return (0);

7
cups.spec
View File

@ -7,7 +7,7 @@
Name: cups Name: cups
Version: 2.2.8 Version: 2.2.8
Release: 1mamba Release: 2mamba
Summary: Common UNIX Printing System Summary: Common UNIX Printing System
Group: System/Spooling Group: System/Spooling
Vendor: openmamba Vendor: openmamba
@ -27,6 +27,7 @@ Patch0: %{name}-1.4.4-str3461-1.4.patch
Patch1: %{name}-1.5.0-set_retry_job_default_ErrorPolicy.patch Patch1: %{name}-1.5.0-set_retry_job_default_ErrorPolicy.patch
Patch2: cups-1.6.1-usb-backend-reset-after-job-only-for-specific-devices-3.patch Patch2: cups-1.6.1-usb-backend-reset-after-job-only-for-specific-devices-3.patch
Patch3: cups-1.7.0-statedir.patch Patch3: cups-1.7.0-statedir.patch
Patch4: cups-2.2.8-fix-balidation-rejecting-all-names.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -82,6 +83,7 @@ It is based on the "Internet Printing Protocol" and provides complete printing s
%patch1 -p1 %patch1 -p1
#%patch2 -p0 #%patch2 -p0
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
autoconf autoconf
@ -300,6 +302,9 @@ fi
#%doc CHANGES.txt README.txt #%doc CHANGES.txt README.txt
%changelog %changelog
* Tue Jun 12 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.8-2mamba
- added upstream patch to fix 100% cpu usage regression (https://github.com/apple/cups/issues/5325)
* Tue Jun 05 2018 Automatic Build System <autodist@mambasoft.it> 2.2.8-1mamba * Tue Jun 05 2018 Automatic Build System <autodist@mambasoft.it> 2.2.8-1mamba
- automatic version update by autodist - automatic version update by autodist