rpms/cups
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Applied patch for CVE-2010-0302 (incomplete fix for CVE-2009-3553, bug

Browse Source 
#557775).
This commit is contained in:
Tim Waugh 2010-03-05 10:53:16 +00:00
parent 1df432890c
commit 038e4fc995
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cups-CVE-2010-0302.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up cups-1.4.2/scheduler/select.c.CVE-2010-0302 cups-1.4.2/scheduler/select.c
--- cups-1.4.2/scheduler/select.c.CVE-2010-0302 2010-03-05 10:37:49.990476887 +0000
+++ cups-1.4.2/scheduler/select.c 2010-03-05 10:38:01.803478081 +0000
@@ -454,7 +454,8 @@ cupsdDoSelect(long timeout) /* I - Time
if (fdptr->read_cb && event->filter == EVFILT_READ)
(*(fdptr->read_cb))(fdptr->data);
- if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
+ if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE &&
+ !cupsArrayFind(cupsd_inactive_fds, fdptr))
(*(fdptr->write_cb))(fdptr->data);
release_fd(fdptr);
@@ -499,7 +500,9 @@ cupsdDoSelect(long timeout) /* I - Time
if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
(*(fdptr->read_cb))(fdptr->data);
- if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ if (fdptr->use > 1 && fdptr->write_cb &&
+ (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)) &&
+ !cupsArrayFind(cupsd_inactive_fds, fdptr))
(*(fdptr->write_cb))(fdptr->data);
release_fd(fdptr);

8
cups.spec
View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.2
Release: 27%{?dist}
Release: 28%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -82,6 +82,7 @@ Patch54: cups-str3505.patch
Patch100: cups-lspp.patch
## SECURITY PATCHES:
Patch200: cups-CVE-2010-0302.patch
Epoch: 1
@ -268,6 +269,7 @@ module.
%endif
# SECURITY PATCHES:
%patch200 -p1 -b .CVE-2010-0302
sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
@ -560,6 +562,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Fri Mar 5 2010 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-28
- Applied patch for CVE-2010-0302 (incomplete fix for CVE-2009-3553,
bug #557775).
* Tue Mar 2 2010 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-27
- Don't own filesystem locale directories (bug #569403).
- Don't apply gcrypt threading patch (bug #553834).