lkml.org 
[lkml]   [2006]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] fs: sys_poll with timeout -1 bug fix
Date
From
From: Frode Isaksen <frode.isaksen@gmail.com>

If you do a poll() call with timeout -1, the wait will be a big
number (depending on HZ) instead of infinite wait, since -1 is
passed to the msecs_to_jiffies function.

Signed-off-by: Frode Isaksen <frode.isaksen@gmail.com>

---
--- linux-2.6.16.20/fs/select.c.orig.c 2006-06-05 19:18:23.000000000
+0200
+++ linux-2.6.16.20/fs/select.c 2006-06-15 14:20:47.000000000 +0200
@@ -699,9 +699,9 @@ out_fds:
asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int
nfds,
long timeout_msecs)
{
- s64 timeout_jiffies = 0;
+ s64 timeout_jiffies;

- if (timeout_msecs) {
+ if (timeout_msecs > 0) {
#if HZ > 1000
/* We can only overflow if HZ > 1000 */
if (timeout_msecs / 1000 > (s64)0x7fffffffffffffffULL / (s64)HZ)
@@ -709,6 +709,9 @@ asmlinkage long sys_poll(struct pollfd _
else
#endif
timeout_jiffies = msecs_to_jiffies(timeout_msecs);
+ } else {
+ /* Infinite (-1) or no (0) timeout */
+ timeout_jiffies = timeout_msecs;
}

return do_sys_poll(ufds, nfds, &timeout_jiffies);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-06-15 17:35    [W:0.049 / U:0.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site