diff options
| author | Jeremy Allison <jra@samba.org> | 2011-02-28 11:23:53 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-02-28 21:10:08 +0100 |
| commit | 6e66208f6320949ba740e8d939fcfbb259ab0c67 (patch) | |
| tree | 22cb56f16306372cab8f45b5dea73430dafdc9be | |
| parent | 26321c6010dbd461e85111daf358e6c23a0b47b2 (diff) | |
| download | samba-6e66208f6320949ba740e8d939fcfbb259ab0c67.tar.gz samba-6e66208f6320949ba740e8d939fcfbb259ab0c67.tar.bz2 samba-6e66208f6320949ba740e8d939fcfbb259ab0c67.zip | |
Finish the range checking on all FD_SET calls for select().
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Feb 28 21:10:08 CET 2011 on sn-devel-104
| -rw-r--r-- | lib/tevent/tevent_select.c | 10 | ||||
| -rw-r--r-- | lib/tevent/tevent_standard.c | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/tevent/tevent_select.c b/lib/tevent/tevent_select.c index 8cc6d06a59..94faa86593 100644 --- a/lib/tevent/tevent_select.c +++ b/lib/tevent/tevent_select.c @@ -111,6 +111,11 @@ static struct tevent_fd *select_event_add_fd(struct tevent_context *ev, TALLOC_C struct select_event_context); struct tevent_fd *fde; + if (fd < 0 || fd >= FD_SETSIZE) { + errno = EBADF; + return NULL; + } + fde = tevent_common_add_fd(ev, mem_ctx, fd, flags, handler, private_data, handler_name, location); @@ -144,6 +149,11 @@ static int select_event_loop_select(struct select_event_context *select_ev, stru /* setup any fd events */ for (fde = select_ev->ev->fd_events; fde; fde = fde->next) { + if (fde->fd < 0 || fde->fd >= FD_SETSIZE) { + errno = EBADF; + return -1; + } + if (fde->flags & TEVENT_FD_READ) { FD_SET(fde->fd, &r_fds); } diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c index a68a03c2ac..35f7ded9b7 100644 --- a/lib/tevent/tevent_standard.c +++ b/lib/tevent/tevent_standard.c @@ -457,6 +457,10 @@ static int std_event_loop_select(struct std_event_context *std_ev, struct timeva /* setup any fd events */ for (fde = std_ev->ev->fd_events; fde; fde = fde->next) { + if (fde->fd < 0 || fde->fd >= FD_SETSIZE) { + std_ev->exit_code = EBADF; + return -1; + } if (fde->flags & TEVENT_FD_READ) { FD_SET(fde->fd, &r_fds); } |