aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2013-01-24 13:50:39 -0800
committerBen Pfaff <blp@nicira.com>2013-02-01 14:27:20 -0800
commit75b0b752d8d70edcd08f18e1028d60537cdede85 (patch)
tree67a3238ae2adef888f568253340ef20d367da153 /lib
parent3b9ed5937ac6fbfc885ed7c7b39a7708162bd8fb (diff)
timeval: Avoid unnecessary integer overflow in time_alarm().
Durations longer than 4294967 seconds would unnecessarily overflow in the multiplication here. Found by Coverity. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/timeval.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/timeval.c b/lib/timeval.c
index d91305c6..ef9c8fe8 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -328,7 +328,7 @@ time_alarm(unsigned int secs)
time_refresh();
now = time_msec();
- msecs = secs * 1000;
+ msecs = secs * 1000LL;
block_sigalrm(&oldsigs);
deadline = now < LLONG_MAX - msecs ? now + msecs : LLONG_MAX;