Changeset 578 for branches/samba-3.3.x/source/nsswitch

Timestamp:

Jun 25, 2011, 7:14:41 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.15 (security update)

File:

• branches/samba-3.3.x/source/nsswitch/wb_common.c (modified) (3 diffs)

branches/samba-3.3.x/source/nsswitch/wb_common.c

@@ -241 +241 @@
                 switch (errno) {
                         case EINPROGRESS:
+
+                                if (fd < 0 || fd >= FD_SETSIZE) {
+                                        errno = EBADF;
+                                        goto error_out;
+                                }
+
                                 FD_ZERO(&w_fds);
                                 FD_SET(fd, &w_fds);
@@ -384 +390 @@
                 struct timeval tv;
                 fd_set r_fds;
-                
+
+                if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        winbind_close_sock();
+                        return -1;
+                }
+
                 /* Catch pipe close on other end by checking if a read()
                    call would not block by calling select(). */
@@ -444 +456 @@
                 struct timeval tv;
                 fd_set r_fds;
-                
+
+                if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        winbind_close_sock();
+                        return -1;
+                }
+
                 /* Catch pipe close on other end by checking if a read()
                    call would not block by calling select(). */