From c2bee984c94bf1dfc300388bfddd0a8ae348b8fb Mon Sep 17 00:00:00 2001
From: Davide Libenzi <davidel@xmailserver.org>
Date: Tue, 27 Sep 2005 21:45:33 -0700
Subject: [PATCH] --- yaml --- r: 9387 b: refs/heads/master c:
 e3306dd5f7eb2e699f36a4a313fca4b48b18d5e1 h: refs/heads/master i:   9385:
 4be11b89feb7b69ebd42f4e79f50cc2c16071738   9383:
 ebb4344f376d68f687e6664af0e6c6f900a3780f v: v3

---
 [refs]               | 2 +-
 trunk/fs/eventpoll.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ec7636de30a3..d1ddda5f44de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2d613799af915da1fd78463ba8ec5086a0d6f92
+refs/heads/master: e3306dd5f7eb2e699f36a4a313fca4b48b18d5e1
diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c
index 403b90a1213d..4284cd31eba6 100644
--- a/trunk/fs/eventpoll.c
+++ b/trunk/fs/eventpoll.c
@@ -101,6 +101,10 @@
 /* Maximum number of poll wake up nests we are allowing */
 #define EP_MAX_POLLWAKE_NESTS 4
 
+/* Maximum msec timeout value storeable in a long int */
+#define EP_MAX_MSTIMEO min(1000ULL * MAX_SCHEDULE_TIMEOUT / HZ, (LONG_MAX - 999ULL) / HZ)
+
+
 struct epoll_filefd {
 	struct file *file;
 	int fd;
@@ -1506,8 +1510,8 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
 	 * and the overflow condition. The passed timeout is in milliseconds,
 	 * that why (t * HZ) / 1000.
 	 */
-	jtimeout = timeout == -1 || timeout > (MAX_SCHEDULE_TIMEOUT - 1000) / HZ ?
-		MAX_SCHEDULE_TIMEOUT: (timeout * HZ + 999) / 1000;
+	jtimeout = (timeout < 0 || timeout >= EP_MAX_MSTIMEO) ?
+		MAX_SCHEDULE_TIMEOUT : (timeout * HZ + 999) / 1000;
 
 retry:
 	write_lock_irqsave(&ep->lock, flags);