Changeset 591 for vendor/current/source3/lib

Timestamp:

Jul 1, 2011, 9:17:44 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.7

Location:

vendor/current/source3/lib

Files:

• events.c (modified) (1 diff)
• g_lock.c (modified) (1 diff)
• packet.c (modified) (1 diff)
• readline.c (modified) (1 diff)
• select.c (modified) (2 diffs)
• util_sock.c (modified) (4 diffs)

vendor/current/source3/lib/events.c

@@ -56 +56 @@
 
         for (fde = ev->fd_events; fde; fde = fde->next) {
+                if (fde->fd < 0 || fde->fd >= FD_SETSIZE) {
+                        /* We ignore here, as it shouldn't be
+                           possible to add an invalid fde->fd
+                           but we don't want FD_SET to see an
+                           invalid fd. */
+                        continue;
+                }
+
                 if (fde->flags & EVENT_FD_READ) {
                         FD_SET(fde->fd, read_fds);

vendor/current/source3/lib/g_lock.c

@@ -392 +392 @@
                         FD_ZERO(r_fds);
                         max_fd = ctdbd_conn_get_fd(conn);
-                        FD_SET(max_fd, r_fds);
+                        if (max_fd >= 0 && max_fd < FD_SETSIZE) {
+                                FD_SET(max_fd, r_fds);
+                        }
                 }
 #endif

vendor/current/source3/lib/packet.c

@@ -108 +108 @@
         fd_set r_fds;
 
+        if (ctx->fd < 0 || ctx->fd >= FD_SETSIZE) {
+                errno = EBADF;
+                return map_nt_error_from_unix(errno);
+        }
+
         FD_ZERO(&r_fds);
         FD_SET(ctx->fd, &r_fds);

vendor/current/source3/lib/readline.c

@@ -92 +92 @@
                 timeout.tv_usec = 0;
 
+                if (fd < 0 || fd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        break;
+                }
+
                 FD_ZERO(&fds);
                 FD_SET(fd,&fds);

vendor/current/source3/lib/select.c

@@ -76 +76 @@
                 }
 
+                if (select_pipe[0] < 0 || select_pipe[0] >= FD_SETSIZE) {
+                        DEBUG(0, ("sys_select: bad fd\n"));
+                        if (readfds != NULL)
+                                FD_ZERO(readfds);
+                        if (writefds != NULL)
+                                FD_ZERO(writefds);
+                        if (errorfds != NULL)
+                                FD_ZERO(errorfds);
+                        errno = EBADF;
+                        return -1;
+                }
                 /*
                  * These next two lines seem to fix a bug with the Linux
@@ -102 +113 @@
                 FD_ZERO(readfds2);
         }
+
         FD_SET(select_pipe[0], readfds2);
 

vendor/current/source3/lib/util_sock.c

@@ -496 +496 @@
 
         for (nread=0; nread < mincnt; ) {
+                if (fd < 0 || fd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        return map_nt_error_from_unix(EBADF);
+                }
+
                 FD_ZERO(&fds);
                 FD_SET(fd,&fds);
@@ -1236 +1241 @@
         for (i=0; i<num_addrs; i++) {
                 sockets[i] = socket(addrs[i].ss_family, SOCK_STREAM, 0);
-                if (sockets[i] < 0)
+                if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE)
                         goto done;
                 set_blocking(sockets[i], false);
@@ -1285 +1290 @@
 
         for (i=0; i<num_addrs; i++) {
-                if (sockets[i] == -1)
+                if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE) {
+                        /* This cannot happen - ignore if so. */
                         continue;
+                }
                 FD_SET(sockets[i], &wr_fds);
                 FD_SET(sockets[i], &r_fds);
@@ -1306 +1313 @@
         for (i=0; i<num_addrs; i++) {
 
-                if (sockets[i] == -1)
+                if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE) {
+                        /* This cannot happen - ignore if so. */
                         continue;
+                }
 
                 /* Stevens, Network Programming says that if there's a