From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 29 Oct 2011 15:16:08 +0000 (+0200)
Subject: Guard against unusable fd in pthreads' empth_select()
X-Git-Tag: v4.3.29~44
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=9be42299b58a443e3612dbea262448fff029853d

Guard against unusable fd in pthreads' empth_select()

0 <= fd < FD_SETSIZE must hold, or else undefined behavior in
FD_SET().
---

diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c
index 6339459e3..0c0ef5dcd 100644
--- a/src/lib/empthread/pthread.c
+++ b/src/lib/empthread/pthread.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Sasha Mikheev
  *     Steve McClure, 1998
- *     Markus Armbruster, 2005-2010
+ *     Markus Armbruster, 2005-2011
  *     Ron Koenderink, 2007-2009
  */
 
@@ -289,6 +289,11 @@ empth_select(int fd, int flags, struct timeval *timeout)
     empth_t *ctx;
     int res = 0;
 
+    if (CANT_HAPPEN(fd < 0 || fd >= FD_SETSIZE)) {
+	errno = EBADF;
+	return -1;
+    }
+
     ef_make_stale();
     pthread_mutex_unlock(&mtx_ctxsw);
     empth_status("select on %d for %d", fd, flags);