Skip to content

Commit 4b86ac1

Browse files
liulanzelanzeliu
andauthored
cups: patch CVE-2022-26691. (#9168)
Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
1 parent 61c7a0b commit 4b86ac1

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

SPECS/cups/CVE-2022-26691.patch

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/scheduler/cert.c b/scheduler/cert.c
2+
index 258e8fc83..8043625fe 100644
3+
--- a/scheduler/cert.c
4+
+++ b/scheduler/cert.c
5+
@@ -434,5 +434,12 @@
6+
b ++;
7+
}
8+
9+
- return (result);
10+
+ /*
11+
+ * The while loop finishes when *a == '\0' or *b == '\0'
12+
+ * so after the while loop either both *a and *b == '\0',
13+
+ * or one points inside a string, so when we apply logical OR on *a,
14+
+ * *b and result, we get a non-zero return value if the compared strings don't match.
15+
+ */
16+
+
17+
+ return (result | *a | *b);
18+
}

SPECS/cups/cups.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Summary: CUPS printing system
1313
Name: cups
1414
Version: 2.3.3%{OP_VER}
15-
Release: 7%{?dist}
15+
Release: 8%{?dist}
1616
License: ASL 2.0 with exceptions
1717
Vendor: Microsoft Corporation
1818
Distribution: Mariner
@@ -63,6 +63,7 @@ Patch13: cups-dymo-deviceid.patch
6363
Patch14: CVE-2023-4504.patch
6464
Patch15: CVE-2023-32324.patch
6565
Patch16: CVE-2023-34241.patch
66+
Patch17: CVE-2022-26691.patch
6667
#### UPSTREAM PATCHES (starts with 1000) ####
6768
##### Patches removed because IMHO they aren't no longer needed
6869
##### but still I'll leave them in git in case their removal
@@ -264,6 +265,7 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
264265
%patch14 -p1
265266
%patch15 -p1
266267
%patch16 -p1
268+
%patch17 -p1
267269

268270
# LSPP support.
269271
%patch100 -p1 -b .lspp
@@ -655,6 +657,9 @@ rm -f %{cups_serverbin}/backend/smb
655657
%{_mandir}/man7/ippeveps.7.gz
656658

657659
%changelog
660+
* Tue May 21 2024 Lanze Liu <lanzeliu@microsoft.com> - 2.3.3op2-8
661+
- Add patch for CVE-2022-26691.
662+
658663
* Fri Apr 12 2024 Amrita Kohli <amritakohli@microsoft.com> - 2.3.3op2-7
659664
- Add patch for CVE-2023-32324.
660665
- Add patch for CVE-2023-34241.

0 commit comments

Comments
 (0)