Changeset 593 for trunk/server/source3/nmbd/nmbd_packets.c

Timestamp:

Jul 1, 2011, 10:18:23 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.7

File:

• trunk/server/source3/nmbd/nmbd_packets.c (modified) (5 diffs)

trunk/server/source3/nmbd/nmbd_packets.c

@@ -1697 +1697 @@
         count *= 4;
 
-        if(count > FD_SETSIZE) {
+        if(count >= FD_SETSIZE) {
                 DEBUG(0,("create_listen_fdset: Too many file descriptors needed (%d). We can \
 only use %d.\n", count, FD_SETSIZE));
@@ -1713 +1713 @@
 
         /* Add in the lp_socket_address() interface on 137. */
+        if (ClientNMB < 0 || ClientNMB >= FD_SETSIZE) {
+                errno = EBADF;
+                SAFE_FREE(pset);
+                return True;
+        }
+
         FD_SET(ClientNMB,pset);
         sock_array[num++] = ClientNMB;
@@ -1722 +1728 @@
         /* Add in the 137 sockets on all the interfaces. */
         for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+                if (subrec->nmb_sock < 0 || subrec->nmb_sock >= FD_SETSIZE) {
+                        /* We have to ignore sockets outside FD_SETSIZE. */
+                        continue;
+                }
                 FD_SET(subrec->nmb_sock,pset);
                 sock_array[num++] = subrec->nmb_sock;
                 *maxfd = MAX( *maxfd, subrec->nmb_sock);
 
+                if (subrec->nmb_bcast < 0 || subrec->nmb_bcast >= FD_SETSIZE) {
+                        /* We have to ignore sockets outside FD_SETSIZE. */
+                        continue;
+                }
                 sock_array[num++] = subrec->nmb_bcast;
-                if (subrec->nmb_bcast != -1) {
-                        FD_SET(subrec->nmb_bcast,pset);
-                        *maxfd = MAX( *maxfd, subrec->nmb_bcast);
-                }
+                FD_SET(subrec->nmb_bcast,pset);
+                *maxfd = MAX( *maxfd, subrec->nmb_bcast);
         }
 
         /* Add in the lp_socket_address() interface on 138. */
+        if (ClientDGRAM < 0 || ClientDGRAM >= FD_SETSIZE) {
+                errno = EBADF;
+                SAFE_FREE(pset);
+                return True;
+        }
         FD_SET(ClientDGRAM,pset);
         sock_array[num++] = ClientDGRAM;
@@ -1743 +1760 @@
         /* Add in the 138 sockets on all the interfaces. */
         for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+                if (subrec->dgram_sock < 0 || subrec->dgram_sock >= FD_SETSIZE) {
+                        /* We have to ignore sockets outside FD_SETSIZE. */
+                        continue;
+                }
                 FD_SET(subrec->dgram_sock,pset);
                 sock_array[num++] = subrec->dgram_sock;
                 *maxfd = MAX( *maxfd, subrec->dgram_sock);
 
+                if (subrec->dgram_bcast < 0 || subrec->dgram_bcast >= FD_SETSIZE) {
+                        /* We have to ignore sockets outside FD_SETSIZE. */
+                        continue;
+                }
                 sock_array[num++] = subrec->dgram_bcast;
                 if (subrec->dgram_bcast != -1) {
@@ -1877 +1902 @@
 #ifndef SYNC_DNS
         dns_fd = asyncdns_fd();
-        if (dns_fd != -1) {
+        if (dns_fd >= 0 && dns_fd < FD_SETSIZE) {
                 FD_SET(dns_fd, &r_fds);
                 maxfd = MAX( maxfd, dns_fd);