Attachment 41917 Details for Bug 32992 – [4/4] _dbus_loop_iterate: if the kernel says a fd is bad, stop watching it

[patch] [4/4] _dbus_loop_iterate: if the kernel says a fd is bad, stop watching it

0004-_dbus_loop_iterate-if-the-kernel-says-a-fd-is-bad-st.patch (text/plain), 1.49 KB, created by Simon McVittie on 2011-01-12 04:26:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-01-12 04:26:22 UTC

Size: 1.49 KB

patch

obsolete

>From 8cba24e8e5e7d9b994a7059c59d63c5ce2bb7551 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 12 Jan 2011 12:14:49 +0000
>Subject: [PATCH 4/4] _dbus_loop_iterate: if the kernel says a fd is bad, stop watching it
>
>Again, this shouldn't happen - modules are responsible for cleaning up
>their watches - but the failure mode here is really bad: if we leave an
>invalid fd in the set, every poll() call will instantly return, marking
>it as POLLNVAL. The result is that dbus-daemon busy-loops on poll()
>without responding to I/O, so the bad watch will probably never be
>cleared up.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32992
>Bug-NB: NB#200248
>---
> dbus/dbus-mainloop.c |    9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
>diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
>index c375138..43159a7 100644
>--- a/dbus/dbus-mainloop.c
>+++ b/dbus/dbus-mainloop.c
>@@ -829,6 +829,15 @@ _dbus_loop_iterate (DBusLoop     *loop,
>                   
>                   retval = TRUE;
>                 }
>+
>+              if (_DBUS_UNLIKELY (fds[i].revents & _DBUS_POLLNVAL))
>+                {
>+                  _dbus_warn ("invalid request, socket fd %d not open\n",
>+                      fds[i].fd);
>+                  _dbus_watch_invalidate (wcb->watch);
>+                  _dbus_loop_remove_watch (loop, wcb->watch, wcb->function,
>+                      ((Callback *)wcb)->data);
>+                }
>             }
>               
>           ++i;
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 32992: 41912 | 41914 | 41916 | 41917

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.