[PULL,for-2.8,01/13] blockjob: fix dead pointer in txn list

Commit Message

Jeff Cody Nov. 15, 2016, 4:14 a.m. UTC

From: Vladimir Sementsov-Ogievskiy <[e-mail]>

Though it is not intended to be reached through normal circumstances,
if we do not gracefully deconstruct the transaction QLIST, we may wind
up with stale pointers in the list.

The rest of this series attempts to address the underlying issues,
but this should fix list inconsistencies.

Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Tested-by: John Snow <[e-mail]>
Reviewed-by: John Snow <[e-mail]>
Reviewed-by: Eric Blake <[e-mail]>
Reviewed-by: Kevin Wolf <[e-mail]>
Signed-off-by: John Snow <[e-mail]>
Message-id: [e-mail]
[Rewrote commit message. --js]
Signed-off-by: John Snow <[e-mail]>
Reviewed-by: Eric Blake <[e-mail]>
Reviewed-by: Kevin Wolf <[e-mail]>

Signed-off-by: John Snow <[e-mail]>
Signed-off-by: Jeff Cody <[e-mail]>
---
 blockjob.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/blockjob.c b/blockjob.c
index 4aa14a4..4d0ef53 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -256,6 +256,7 @@  static void block_job_completed_single(BlockJob *job)
     }
 
     if (job->txn) {
+        QLIST_REMOVE(job, txn_list);
         block_job_txn_unref(job->txn);
     }
     block_job_unref(job);