mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

814. [bug] Socket objects left over from accept() failures

Browse Source 
were incorrectly destroyed, causing corruption
                        of socket manager data structures.

 813.   [bug]           File descriptors exceeding FD_SETSIZE were handled
                        badly. [RT #1192]
This commit is contained in:
Andreas Gustafsson
2001-04-26 23:45:55 +00:00
parent e482a1c91e
commit 5e194abb5b
3 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES
View File

@@ -1,4 +1,11 @@
814. [bug] Socket objects left over from accept() failures
were incorrectly destroyed, causing corruption
of socket manager data structures.
813. [bug] File descriptors exceeding FD_SETSIZE were handled
badly. [RT #1192]
812. [bug] dig sometimes printed incomplete IXFR responses 812. [bug] dig sometimes printed incomplete IXFR responses
due to an uninitialized variable. [RT #1188] due to an uninitialized variable. [RT #1188]

3
lib/isc/include/isc/msgs.h
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: msgs.h,v 1.4 2001/02/22 19:12:57 gson Exp $ */ /* $Id: msgs.h,v 1.5 2001/04/26 23:45:55 gson Exp $ */
#ifndef ISC_MSGS_H #ifndef ISC_MSGS_H
#define ISC_MSGS_H 1 #define ISC_MSGS_H 1
@@ -143,6 +143,7 @@
#define ISC_MSG_PKTINFOPROVIDED 1416 /* "pktinfo structure provided, ..." */ #define ISC_MSG_PKTINFOPROVIDED 1416 /* "pktinfo structure provided, ..." */
#define ISC_MSG_BOUND 1417 /* "bound" */ #define ISC_MSG_BOUND 1417 /* "bound" */
#define ISC_MSG_ACCEPTRETURNED 1418 /* accept() returned %d/%s */ #define ISC_MSG_ACCEPTRETURNED 1418 /* accept() returned %d/%s */
#define ISC_MSG_TOOMANYFDS 1419 /* %s: too many open file descriptors */
#define ISC_MSG_AWAKE 1502 /* "awake" */ #define ISC_MSG_AWAKE 1502 /* "awake" */
#define ISC_MSG_WORKING 1503 /* "working" */ #define ISC_MSG_WORKING 1503 /* "working" */

42
lib/isc/unix/socket.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.197 2001/04/24 18:40:07 gson Exp $ */ /* $Id: socket.c,v 1.198 2001/04/26 23:45:54 gson Exp $ */
#include <config.h> #include <config.h>
@@ -324,7 +324,8 @@ wakeup_socket(isc_socketmgr_t *manager, int fd, int msg) {
* process of being closed, start watching it for either reads * process of being closed, start watching it for either reads
* or writes. * or writes.
*/ */
INSIST(fd < FD_SETSIZE);
INSIST(fd >= 0 && fd < FD_SETSIZE);
if (manager->fdstate[fd] == CLOSE_PENDING) { if (manager->fdstate[fd] == CLOSE_PENDING) {
manager->fdstate[fd] = CLOSED; manager->fdstate[fd] = CLOSED;
@@ -1110,6 +1111,7 @@ destroy(isc_socket_t **sockp) {
INSIST(ISC_LIST_EMPTY(sock->recv_list)); INSIST(ISC_LIST_EMPTY(sock->recv_list));
INSIST(ISC_LIST_EMPTY(sock->send_list)); INSIST(ISC_LIST_EMPTY(sock->send_list));
INSIST(sock->connect_ev == NULL); INSIST(sock->connect_ev == NULL);
REQUIRE(sock->fd >= 0 && sock->fd < FD_SETSIZE);
LOCK(&manager->lock); LOCK(&manager->lock);
@@ -1270,6 +1272,17 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
sock->fd = socket(pf, SOCK_STREAM, IPPROTO_TCP); sock->fd = socket(pf, SOCK_STREAM, IPPROTO_TCP);
break; break;
} }
if (sock->fd >= FD_SETSIZE) {
(void)close(sock->fd);
isc_log_iwrite(isc_lctx, ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
isc_msgcat, ISC_MSGSET_SOCKET, ISC_MSG_TOOMANYFDS,
"%s: too many open file descriptors", "socket");
free_socket(&sock);
return (ISC_R_NORESOURCES);
}
if (sock->fd < 0) { if (sock->fd < 0) {
free_socket(&sock); free_socket(&sock);
@@ -1707,6 +1720,15 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
sock->pf); sock->pf);
(void)close(fd); (void)close(fd);
goto soft_error; goto soft_error;
} else if (fd >= FD_SETSIZE) {
isc_log_iwrite(isc_lctx, ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
isc_msgcat, ISC_MSGSET_SOCKET,
ISC_MSG_TOOMANYFDS,
"%s: too many open file descriptors",
"accept");
(void)close(fd);
goto soft_error;
} }
} }
@@ -1734,13 +1756,13 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
result = ISC_R_UNEXPECTED; result = ISC_R_UNEXPECTED;
} }
LOCK(&manager->lock);
ISC_LIST_APPEND(manager->socklist, dev->newsocket, link);
/* /*
* -1 means the new socket didn't happen. * -1 means the new socket didn't happen.
*/ */
if (fd != -1) { if (fd != -1) {
LOCK(&manager->lock);
ISC_LIST_APPEND(manager->socklist, dev->newsocket, link);
dev->newsocket->fd = fd; dev->newsocket->fd = fd;
dev->newsocket->bound = 1; dev->newsocket->bound = 1;
dev->newsocket->connected = 1; dev->newsocket->connected = 1;
@@ -1759,12 +1781,12 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
isc_msgcat, ISC_MSGSET_SOCKET, ISC_MSG_ACCEPTEDCXN, isc_msgcat, ISC_MSGSET_SOCKET, ISC_MSG_ACCEPTEDCXN,
"accepted connection, new socket %p", "accepted connection, new socket %p",
dev->newsocket); dev->newsocket);
}
UNLOCK(&manager->lock); UNLOCK(&manager->lock);
} else {
if (fd == -1) dev->newsocket->references--;
isc_socket_detach(&dev->newsocket); free_socket(&dev->newsocket);
}
/* /*
* Fill in the done event details and send it off. * Fill in the done event details and send it off.
@@ -1910,6 +1932,8 @@ process_fds(isc_socketmgr_t *manager, int maxfd,
isc_socket_t *sock; isc_socket_t *sock;
isc_boolean_t unlock_sock; isc_boolean_t unlock_sock;
REQUIRE(maxfd <= FD_SETSIZE);
/* /*
* Process read/writes on other fds here. Avoid locking * Process read/writes on other fds here. Avoid locking
* and unlocking twice if both reads and writes are possible. * and unlocking twice if both reads and writes are possible.