Commit 6c44d3d9 authored by Michael Biebl's avatar Michael Biebl
Browse files

core/transaction: fix cycle break attempts outside transaction

Cherry-pick upstream fix which prevents systemd from entering an
infinite loop when trying to break an ordering cycle

Closes: #752259
parent d2e8e037
......@@ -5,6 +5,8 @@ systemd (204-13) UNRELEASED; urgency=medium
usage of the "=" assignment operator. We need to use "+=" here, so the sg
module is loaded in addition to other scsi modules, which are loaded via
the modalias rule. Thanks to Tommaso Colombo for the analysis.
* Cherry-pick upstream fix which prevents systemd from entering an infinite
loop when trying to break an ordering cycle. (Closes: #752259)
-- Michael Biebl <biebl@debian.org> Fri, 27 Jun 2014 22:37:23 +0200
......
From: Uoti Urpala <uoti.urpala@pp1.inet.fi>
Date: Mon, 23 Jun 2014 16:50:03 +0300
Subject: core/transaction: fix cycle break attempts outside transaction
Patch fixes some incorrect-looking code in transaction.c.
It could fix cases where Debian users with bad package configurations
had systemd go into an infinite loop printing messages about breaking an
ordering cycle, though I have not reproduced that problem myself.
transaction_verify_order_one() considers jobs/units outside current
transaction when checking whether ordering dependencies cause cycles.
It would also incorrectly try to break cycles at these jobs; this
cannot work, as the break action is to remove the job from the
transaction, which is a no-op if the job isn't part of the transaction
to begin with. The unit_matters_to_anchor() test also looks like it
would not work correctly for non-transaction jobs. Add a check to
verify that the unit is part of the transaction before considering a
job a candidate for deletion.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752259
---
src/core/transaction.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/transaction.c b/src/core/transaction.c
index fa97b69..8a4f50f 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -374,7 +374,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
"Walked on cycle path to %s/%s",
k->unit->id, job_type_to_string(k->type));
- if (!delete &&
+ if (!delete && hashmap_get(tr->jobs, k->unit) &&
!unit_matters_to_anchor(k->unit, k)) {
/* Ok, we can drop this one, so let's
* do so. */
......@@ -58,3 +58,4 @@ Advertise-hibernation-only-if-there-s-enough-free-sw.patch
journal-handle-multiline-syslog-messages.patch
libudev-fix-memleak-when-enumerating-childs.patch
Add-run-initctl-support-to-SysV-compat-tools.patch
core-transaction-fix-cycle-break-attempts-outside-tr.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment