ChromeOS: cherry-pick upstream DBus bug fix for infinite loop in dbus-daemon |
|||||||||
Issue descriptionsys-apps/dbus on Chrome OS is currently at 1.6.8, which has a bug that can potentially keep dbus-daemon in an infinite loop: https://bugs.freedesktop.org/show_bug.cgi?id=68945 We should cherry-pick this upstream fix before sys-apps/bus is upgraded to a newer revision ( issue 674286 ): https://cgit.freedesktop.org/dbus/dbus/commit/?id=fc600b6a8f0dec5642b45c1026dee24c9adb9bc2
,
Dec 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/8d11c99a29f8c71a96ea11ba2522c91a43b2614d commit 8d11c99a29f8c71a96ea11ba2522c91a43b2614d Author: Ben Chan <benchan@chromium.org> Date: Wed Dec 14 22:11:19 2016 sys-apps/dbus: cherry-pick upstream fix for infinite loop in dbus-daemon This CL cherry-picks the following upstream fix to address a potential issue in dbus-daemon that gets stuck in an infinite loop (see https://bugs.freedesktop.org/show_bug.cgi?id=68945 for details): https://cgit.freedesktop.org/dbus/dbus/commit/?id=fc600b6a8f0dec5642b45c1026dee24c9adb9bc2: _dbus_babysitter_unref: avoid infinite loop if waitpid() returns EINTR If waitpid() failed with EINTR, we'd go back for another go, but because ret is nonzero, we'd skip the waitpid() and just keep looping. Also avoid an unnecessary "goto" in favour of a proper loop, to make it more clearly correct. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68945 Reviewed-by: Colin Walters <walters@verbum.org> BUG= chromium:674288 TEST=Trybot runs on paladin and release builders. TEST=Manually exercise DBus interactions via dbus-send and dbus-monitor. Change-Id: If2ec8e133ef26bdd92207f1b2c8ba33e4a700465 Reviewed-on: https://chromium-review.googlesource.com/419776 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> [modify] https://crrev.com/8d11c99a29f8c71a96ea11ba2522c91a43b2614d/sys-apps/dbus/dbus-1.6.8.ebuild [add] https://crrev.com/8d11c99a29f8c71a96ea11ba2522c91a43b2614d/sys-apps/dbus/files/dbus-1.6.8-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch [rename] https://crrev.com/8d11c99a29f8c71a96ea11ba2522c91a43b2614d/sys-apps/dbus/dbus-1.6.8-r13.ebuild
,
Dec 16 2016
,
Dec 16 2016
,
Dec 21 2016
,
Dec 21 2016
Your change meets the bar and is auto-approved for M56 (branch: 2924)
,
Dec 21 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/15c5cfe28d416f9f460cbd9b5a409d00cf8d54ca commit 15c5cfe28d416f9f460cbd9b5a409d00cf8d54ca Author: Ben Chan <benchan@chromium.org> Date: Wed Dec 14 22:11:19 2016 sys-apps/dbus: cherry-pick upstream fix for infinite loop in dbus-daemon This CL cherry-picks the following upstream fix to address a potential issue in dbus-daemon that gets stuck in an infinite loop (see https://bugs.freedesktop.org/show_bug.cgi?id=68945 for details): https://cgit.freedesktop.org/dbus/dbus/commit/?id=fc600b6a8f0dec5642b45c1026dee24c9adb9bc2: _dbus_babysitter_unref: avoid infinite loop if waitpid() returns EINTR If waitpid() failed with EINTR, we'd go back for another go, but because ret is nonzero, we'd skip the waitpid() and just keep looping. Also avoid an unnecessary "goto" in favour of a proper loop, to make it more clearly correct. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68945 Reviewed-by: Colin Walters <walters@verbum.org> BUG= chromium:674288 TEST=Trybot runs on paladin and release builders. TEST=Manually exercise DBus interactions via dbus-send and dbus-monitor. Change-Id: If2ec8e133ef26bdd92207f1b2c8ba33e4a700465 Reviewed-on: https://chromium-review.googlesource.com/419776 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> (cherry picked from commit 8d11c99a29f8c71a96ea11ba2522c91a43b2614d) Reviewed-on: https://chromium-review.googlesource.com/422994 Commit-Queue: Ben Chan <benchan@chromium.org> [modify] https://crrev.com/15c5cfe28d416f9f460cbd9b5a409d00cf8d54ca/sys-apps/dbus/dbus-1.6.8.ebuild [add] https://crrev.com/15c5cfe28d416f9f460cbd9b5a409d00cf8d54ca/sys-apps/dbus/files/dbus-1.6.8-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch [rename] https://crrev.com/15c5cfe28d416f9f460cbd9b5a409d00cf8d54ca/sys-apps/dbus/dbus-1.6.8-r13.ebuild
,
Dec 26 2016
This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible! If all merges have been completed, please remove any remaining Merge-Approved labels from this issue. Thanks for your time! To disable nags, add the Disable-Nags label. For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
,
Dec 29 2016
This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible! If all merges have been completed, please remove any remaining Merge-Approved labels from this issue. Thanks for your time! To disable nags, add the Disable-Nags label. For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
,
Dec 29 2016
,
Aug 1 2017
,
Jan 22 2018
|
|||||||||
►
Sign in to add a comment |
|||||||||
Comment 1 by benchan@chromium.org
, Dec 14 2016