You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
132 lines
4.5 KiB
132 lines
4.5 KiB
5 years ago
|
From 94e08314024c812063bf99bd191a46265a2ba49f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Petr Mensik <pemensik@redhat.com>
|
||
|
|
Date: Wed, 24 Apr 2019 21:10:26 +0200
|
||
|
|
Subject: [PATCH] Missing atomic fix to original CVE patch
|
||
|
|
|
||
|
|
---
|
||
|
|
bin/named/client.c | 18 +++++++-----------
|
||
|
|
bin/named/include/named/interfacemgr.h | 5 +++--
|
||
|
|
bin/named/interfacemgr.c | 7 +++++--
|
||
|
|
3 files changed, 15 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/bin/named/client.c b/bin/named/client.c
|
||
|
|
index 3ada6e9..d3bf47d 100644
|
||
|
|
--- a/bin/named/client.c
|
||
|
|
+++ b/bin/named/client.c
|
||
|
|
@@ -405,12 +405,10 @@ tcpconn_detach(ns_client_t *client) {
|
||
|
|
static void
|
||
|
|
mark_tcp_active(ns_client_t *client, isc_boolean_t active) {
|
||
|
|
if (active && !client->tcpactive) {
|
||
|
|
- isc_atomic_xadd(&client->interface->ntcpactive, 1);
|
||
|
|
+ isc_refcount_increment0(&client->interface->ntcpactive, NULL);
|
||
|
|
client->tcpactive = active;
|
||
|
|
} else if (!active && client->tcpactive) {
|
||
|
|
- uint32_t old =
|
||
|
|
- isc_atomic_xadd(&client->interface->ntcpactive, -1);
|
||
|
|
- INSIST(old > 0);
|
||
|
|
+ isc_refcount_decrement(&client->interface->ntcpactive, NULL);
|
||
|
|
client->tcpactive = active;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -557,7 +555,7 @@ exit_check(ns_client_t *client) {
|
||
|
|
if (client->mortal && TCP_CLIENT(client) &&
|
||
|
|
client->newstate != NS_CLIENTSTATE_FREED &&
|
||
|
|
!ns_g_clienttest &&
|
||
|
|
- isc_atomic_xadd(&client->interface->ntcpaccepting, 0) == 0)
|
||
|
|
+ isc_refcount_current(&client->interface->ntcpaccepting) == 0)
|
||
|
|
{
|
||
|
|
/* Nobody else is accepting */
|
||
|
|
client->mortal = ISC_FALSE;
|
||
|
|
@@ -3321,7 +3319,6 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
|
||
|
|
isc_result_t result;
|
||
|
|
ns_client_t *client = event->ev_arg;
|
||
|
|
isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event;
|
||
|
|
- uint32_t old;
|
||
|
|
|
||
|
|
REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN);
|
||
|
|
REQUIRE(NS_CLIENT_VALID(client));
|
||
|
|
@@ -3341,8 +3338,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
|
||
|
|
INSIST(client->naccepts == 1);
|
||
|
|
client->naccepts--;
|
||
|
|
|
||
|
|
- old = isc_atomic_xadd(&client->interface->ntcpaccepting, -1);
|
||
|
|
- INSIST(old > 0);
|
||
|
|
+ isc_refcount_decrement(&client->interface->ntcpaccepting, NULL);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* We must take ownership of the new socket before the exit
|
||
|
|
@@ -3473,8 +3469,8 @@ client_accept(ns_client_t *client) {
|
||
|
|
* quota is tcp-clients plus the number of listening
|
||
|
|
* interfaces plus 1.)
|
||
|
|
*/
|
||
|
|
- exit = (isc_atomic_xadd(&client->interface->ntcpactive, 0) >
|
||
|
|
- (client->tcpactive ? 1 : 0));
|
||
|
|
+ exit = (isc_refcount_current(&client->interface->ntcpactive) >
|
||
|
|
+ (client->tcpactive ? 1U : 0U));
|
||
|
|
if (exit) {
|
||
|
|
client->newstate = NS_CLIENTSTATE_INACTIVE;
|
||
|
|
(void)exit_check(client);
|
||
|
|
@@ -3532,7 +3528,7 @@ client_accept(ns_client_t *client) {
|
||
|
|
* listening for connections itself to prevent the interface
|
||
|
|
* going dead.
|
||
|
|
*/
|
||
|
|
- isc_atomic_xadd(&client->interface->ntcpaccepting, 1);
|
||
|
|
+ isc_refcount_increment0(&client->interface->ntcpaccepting, NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void
|
||
|
|
diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
|
||
|
|
index d9ac90f..aa21049 100644
|
||
|
|
--- a/bin/named/include/named/interfacemgr.h
|
||
|
|
+++ b/bin/named/include/named/interfacemgr.h
|
||
|
|
@@ -43,6 +43,7 @@
|
||
|
|
#include <isc/magic.h>
|
||
|
|
#include <isc/mem.h>
|
||
|
|
#include <isc/socket.h>
|
||
|
|
+#include <isc/refcount.h>
|
||
|
|
|
||
|
|
#include <dns/result.h>
|
||
|
|
|
||
|
|
@@ -73,11 +74,11 @@ struct ns_interface {
|
||
|
|
/*%< UDP dispatchers. */
|
||
|
|
isc_socket_t * tcpsocket; /*%< TCP socket. */
|
||
|
|
isc_dscp_t dscp; /*%< "listen-on" DSCP value */
|
||
|
|
- int32_t ntcpaccepting; /*%< Number of clients
|
||
|
|
+ isc_refcount_t ntcpaccepting; /*%< Number of clients
|
||
|
|
ready to accept new
|
||
|
|
TCP connections on this
|
||
|
|
interface */
|
||
|
|
- int32_t ntcpactive; /*%< Number of clients
|
||
|
|
+ isc_refcount_t ntcpactive; /*%< Number of clients
|
||
|
|
servicing TCP queries
|
||
|
|
(whether accepting or
|
||
|
|
connected) */
|
||
|
|
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
|
||
|
|
index 96c080b..2ce97bb 100644
|
||
|
|
--- a/bin/named/interfacemgr.c
|
||
|
|
+++ b/bin/named/interfacemgr.c
|
||
|
|
@@ -384,8 +384,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
|
||
|
|
* connections will be handled in parallel even though there is
|
||
|
|
* only one client initially.
|
||
|
|
*/
|
||
|
|
- ifp->ntcpaccepting = 0;
|
||
|
|
- ifp->ntcpactive = 0;
|
||
|
|
+ isc_refcount_init(&ifp->ntcpaccepting, 0);
|
||
|
|
+ isc_refcount_init(&ifp->ntcpactive, 0);
|
||
|
|
|
||
|
|
ifp->nudpdispatch = 0;
|
||
|
|
|
||
|
|
@@ -616,6 +616,9 @@ ns_interface_destroy(ns_interface_t *ifp) {
|
||
|
|
|
||
|
|
ns_interfacemgr_detach(&ifp->mgr);
|
||
|
|
|
||
|
|
+ isc_refcount_destroy(&ifp->ntcpactive);
|
||
|
|
+ isc_refcount_destroy(&ifp->ntcpaccepting);
|
||
|
|
+
|
||
|
|
ifp->magic = 0;
|
||
|
|
isc_mem_put(mctx, ifp, sizeof(*ifp));
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|