GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Make sure FD_SET is not used with an out of range fd.

Browse Source 
* src/posix-io.c (_gpgme_io_select): Check for FD out of range.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-06-14 08:35:12 +02:00
parent 77d149e861
commit 8173c4f1f8
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/posix-io.c
View File

@ -604,6 +604,12 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
continue; continue;
if (fds[i].for_read) if (fds[i].for_read)
{ {
if (fds[i].fd >= FD_SETSIZE)
{
TRACE_END (dbg_help, " -BAD- ]");
gpg_err_set_errno (EBADF);
return TRACE_SYSRES (-1);
}
assert (!FD_ISSET (fds[i].fd, &readfds)); assert (!FD_ISSET (fds[i].fd, &readfds));
FD_SET (fds[i].fd, &readfds); FD_SET (fds[i].fd, &readfds);
if (fds[i].fd > max_fd) if (fds[i].fd > max_fd)
@ -613,6 +619,12 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
} }
else if (fds[i].for_write) else if (fds[i].for_write)
{ {
if (fds[i].fd >= FD_SETSIZE)
{
TRACE_END (dbg_help, " -BAD- ]");
gpg_err_set_errno (EBADF);
return TRACE_SYSRES (-1);
}
assert (!FD_ISSET (fds[i].fd, &writefds)); assert (!FD_ISSET (fds[i].fd, &writefds));
FD_SET (fds[i].fd, &writefds); FD_SET (fds[i].fd, &writefds);
if (fds[i].fd > max_fd) if (fds[i].fd > max_fd)