Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] epoll: handle timeout overflow

Browse source 
Handle the timeout upper boundary for epoll.

Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Davide Libenzi 2005-09-27 21:45:33 -07:00 committed by Linus Torvalds
parent f2d613799a
commit e3306dd5f7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/eventpoll.c
View file

@ -101,6 +101,10 @@
/* Maximum number of poll wake up nests we are allowing */ /* Maximum number of poll wake up nests we are allowing */
#define EP_MAX_POLLWAKE_NESTS 4 #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 epoll_filefd {
struct file *file; struct file *file;
int fd; 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, * and the overflow condition. The passed timeout is in milliseconds,
* that why (t * HZ) / 1000. * that why (t * HZ) / 1000.
*/ */
jtimeout = timeout == -1 || timeout > (MAX_SCHEDULE_TIMEOUT - 1000) / HZ ? jtimeout = (timeout < 0 || timeout >= EP_MAX_MSTIMEO) ?
MAX_SCHEDULE_TIMEOUT: (timeout * HZ + 999) / 1000; MAX_SCHEDULE_TIMEOUT : (timeout * HZ + 999) / 1000;
retry: retry:
write_lock_irqsave(&ep->lock, flags); write_lock_irqsave(&ep->lock, flags);