Require CBlockIndex::GetUndoPos() to hold mutex cs_main

Summary: This is a partial backport of [[bitcoin/bitcoin#22932 | core#22932]] bitcoin/bitcoin@5723934 Depends on D13032 Test Plan: With clang and DEBUG: `ninja all check-all` Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D13033
Bitcoin-ABC · Jan 24, 2023 · 99d5b83 · 99d5b83
1 parent 4d9bd4f
commit 99d5b83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/blockindex.h b/src/blockindex.h
@@ -121,7 +121,8 @@ class CBlockIndex {
         return ret;
     }
 
-    FlatFilePos GetUndoPos() const {
+    FlatFilePos GetUndoPos() const EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
+        AssertLockHeld(::cs_main);
         FlatFilePos ret;
         if (nStatus.hasUndo()) {
             ret.nFile = nFile;

diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
@@ -480,7 +480,8 @@ static bool UndoWriteToDisk(const CBlockUndo &blockundo, FlatFilePos &pos,
 }
 
 bool UndoReadFromDisk(CBlockUndo &blockundo, const CBlockIndex *pindex) {
-    FlatFilePos pos = pindex->GetUndoPos();
+    const FlatFilePos pos{WITH_LOCK(::cs_main, return pindex->GetUndoPos())};
+
     if (pos.IsNull()) {
         return error("%s: no undo data available", __func__);
     }