On Sat, 15 Jan 2011, Shawn Bohrer wrote:
> When a negative timeout value is passed to epoll the 'slack' variable is
> currently unitialized:
>
> fs/eventpoll.c: In function ʽep_pollʼ:
> fs/eventpoll.c:1119: warning: ʽslackʼ may be used uninitialized in this function
>
> In this case a NULL pointer is passed to schedule_hrtimeout_range()
> specifying an infinite timeout. The current implementation of
> schedule_hrtimeout_range() does not use slack in this case, but we
> should still initialize slack to 0 in case future implementations use it.
>
> Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
> Acked-by: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
> ---
> fs/eventpoll.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/eventpoll.c b/fs/eventpoll.c
> index 8cf0724..c24a032 100644
> --- a/fs/eventpoll.c
> +++ b/fs/eventpoll.c
> @@ -1116,7 +1116,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
> {
> int res, eavail, timed_out = 0;
> unsigned long flags;
> - long slack;
> + long slack = 0;
> wait_queue_t wait;
> struct timespec end_time;
> ktime_t expires, *to = NULL;
Re-ACK.
But, I am consolidating 1 and (a rewritten) 2, into a single one, since
they would otherwise conflict with another patch.
- Davide
