Attachment 25773 Details for Bug 16841 – [PATCH 05/11] Fix issue where timeouts can overflow.

[patch] [PATCH 05/11] Fix issue where timeouts can overflow.

0005-Fix-issue-where-timeouts-can-overflow.patch (text/plain), 3.21 KB, created by Scott James Remnant on 2009-05-11 15:44:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott James Remnant

Created: 2009-05-11 15:44:19 UTC

Size: 3.21 KB

patch

obsolete

>From c7b3bdc32ff1d86a9fd8f1f92087996d97bd22d3 Mon Sep 17 00:00:00 2001
>From: Scott James Remnant <scott@ubuntu.com>
>Date: Mon, 11 May 2009 22:41:49 +0100
>Subject: [PATCH 05/11] Fix issue where timeouts can overflow.
>
>* dbus/dbus-connection.c (_dbus_connection_block_pending_call): Rework
>  the timeout math so instead of calculating an end time, which may
>  overflow, we instead calculate the elapsed time which is always
>  smaller than the boundaries.
>
>Signed-off-by: Scott James Remnant <scott@ubuntu.com>
>---
> dbus/dbus-connection.c |   21 +++++++--------------
> 1 files changed, 7 insertions(+), 14 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 31a1d99..d18cad6 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -2275,13 +2275,12 @@ void
> _dbus_connection_block_pending_call (DBusPendingCall *pending)
> {
>   long start_tv_sec, start_tv_usec;
>-  long end_tv_sec, end_tv_usec;
>   long tv_sec, tv_usec;
>   DBusDispatchStatus status;
>   DBusConnection *connection;
>   dbus_uint32_t client_serial;
>   DBusTimeout *timeout;
>-  int timeout_milliseconds;
>+  int timeout_milliseconds, elapsed_milliseconds;
> 
>   _dbus_assert (pending != NULL);
> 
>@@ -2305,18 +2304,12 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
>   if (timeout)
>     {
>       timeout_milliseconds = dbus_timeout_get_interval (timeout);
>-      
>       _dbus_get_current_time (&start_tv_sec, &start_tv_usec);
>-      end_tv_sec = start_tv_sec + timeout_milliseconds / 1000;
>-      end_tv_usec = start_tv_usec + (timeout_milliseconds % 1000) * 1000;
>-      end_tv_sec += end_tv_usec / _DBUS_USEC_PER_SECOND;
>-      end_tv_usec = end_tv_usec % _DBUS_USEC_PER_SECOND;
> 
>-      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): will block %d milliseconds for reply serial %u from %ld sec %ld usec to %ld sec %ld usec\n",
>+      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): will block %d milliseconds for reply serial %u from %ld sec %ld usec\n",
>                      timeout_milliseconds,
>                      client_serial,
>-                     start_tv_sec, start_tv_usec,
>-                     end_tv_sec, end_tv_usec);
>+                     start_tv_sec, start_tv_usec);
>     }
>   else
>     {
>@@ -2365,6 +2358,8 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
>     }
>   
>   _dbus_get_current_time (&tv_sec, &tv_usec);
>+  elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
>+	  (tv_usec - start_tv_usec) / 1000;
>   
>   if (!_dbus_connection_get_is_connected_unlocked (connection))
>     {
>@@ -2406,11 +2401,9 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
>     }
>   else if (tv_sec < start_tv_sec)
>     _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
>-  else if (tv_sec < end_tv_sec ||
>-           (tv_sec == end_tv_sec && tv_usec < end_tv_usec))
>+  else if (elapsed_milliseconds < timeout_milliseconds)
>     {
>-      timeout_milliseconds = (end_tv_sec - tv_sec) * 1000 +
>-        (end_tv_usec - tv_usec) / 1000;
>+      timeout_milliseconds -= elapsed_milliseconds;
>       _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds);
>       _dbus_assert (timeout_milliseconds >= 0);
>       
>-- 
>1.6.0.4
>

Actions: View | Splinter Review

Attachments on bug 16841: 17862 | 17863 | 17864 | 17865 | 17866 | 17867 | 17868 | 17869 | 17870 | 25769 | 25770 | 25771 | 25772 | 25773 | 25774 | 25775 | 25776 | 25777 | 25778 | 25779

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.