You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2005/09/30 18:34:33 UTC
svn commit: r292809 - in /httpd/httpd/trunk: CHANGES
server/mpm/worker/worker.c
Author: trawick
Date: Fri Sep 30 09:34:25 2005
New Revision: 292809
URL: http://svn.apache.org/viewcvs?rev=292809&view=rev
Log:
SECURITY: CAN-2005-2970 (cve.mitre.org)
worker MPM: Fix a memory leak which can occur after an aborted
connection in some limited circumstances.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=292809&r1=292808&r2=292809&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Sep 30 09:34:25 2005
@@ -2,6 +2,10 @@
Changes with Apache 2.3.0
[Remove entries to the current 2.0 and 2.2 section below, when backported]
+ *) SECURITY: CAN-2005-2970 (cve.mitre.org)
+ worker MPM: Fix a memory leak which can occur after an aborted
+ connection in some limited circumstances. [Greg Ames, Jeff Trawick]
+
*) Move mod_dbd to /modules/database/ (Nick Kew)
*) Move mod_filter and mod_charset_lite to /modules/filters/ (Nick Kew)
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=292809&r1=292808&r2=292809&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Fri Sep 30 09:34:25 2005
@@ -724,6 +724,7 @@
}
else {
ptrans = recycled_pool;
+ recycled_pool = NULL;
}
apr_pool_tag(ptrans, "transaction");
rv = lr->accept_func(&csd, lr, ptrans);
@@ -760,10 +761,14 @@
apr_socket_close(csd);
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
"ap_queue_push failed");
+ recycled_pool = ptrans;
}
else {
have_idle_worker = 0;
}
+ }
+ else {
+ recycled_pool = ptrans;
}
}
else {