1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

- Security update to 1.4.4

- Security fix for deny of service vulnerability
Security: CVE-2009-3553
Security: CVE-2010-0302
PR:		147978
Approved by:	portmgr (erwin)
Feature safe:	yes
This commit is contained in:
Dirk Meyer 2010-06-19 04:09:32 +00:00
parent 2edd552094
commit 6705800469
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=256686
2 changed files with 37 additions and 0 deletions

View File

@ -89,6 +89,7 @@ USE_LDCONFIG= yes
PKGMESSAGE= ${NONEXISTENT}
DESCR= ${MASTERDIR}/pkg-descr.image
.else
PORTREVISION= 1
CONFLICTS+= cupsddk-*
CUPS_SUFFIX= -base
LIB_DEPENDS+= cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client \

View File

@ -0,0 +1,36 @@
From b6b656f4b431574069d5b17dc6d3d44910269bb9 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 3 Feb 2010 16:07:11 +0000
Subject: [PATCH] More complete fix for CVE-2009-3553.
---
scheduler/select.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/scheduler/select.c b/scheduler/select.c
index 21a6edc..a2451a5 100644
--- scheduler/select.c
+++ scheduler/select.c
@@ -454,7 +454,8 @@ cupsdDoSelect(long timeout) /* I - Timeout in seconds */
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);
@@ -500,7 +501,8 @@ cupsdDoSelect(long timeout) /* I - Timeout in seconds */
(*(fdptr->read_cb))(fdptr->data);
if (fdptr->use > 1 && fdptr->write_cb &&
- (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)) &&
+ !cupsArrayFind(cupsd_inactive_fds, fdptr))
(*(fdptr->write_cb))(fdptr->data);
release_fd(fdptr);
--
1.6.6