Paths

Table of Contentst

Differential D13031

Require CBlockIndex::GetBlockPos() to hold mutex cs_main
ClosedPublic
Actions

Authored by PiRK on Jan 24 2023, 07:06.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABC1e299c97637c: Require CBlockIndex::GetBlockPos() to hold mutex cs_main

Summary

consensus: don't call GetBlockPos in ReadBlockFromDisk without lock

The cs_main lock only covered the first invocation of CBlockIndex::GetBlockPos().

Use the blockPos local variable instead of calling the function twice, rename it to block_pos, and make it const

This is a backport of core#22895

Require CBlockIndex::GetBlockPos() to hold mutex cs_main

This is a partial backport of core#22932
https://github.com/bitcoin/bitcoin/pull/22932/commits/6fd4341c10b319399c58d71c4ddeae4417e337d7

Test Plan

With clang and DEBUG:

ninja all check-all bitcoin-fuzzers

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Jan 24 2023, 07:06

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 24 2023, 07:06

PiRK requested review of this revision.Jan 24 2023, 07:06

teamcity edited the summary of this revision. (Show Details)Jan 24 2023, 07:06

PiRK added a child revision: D13032: Require WriteUndoDataForBlock() to hold mutex cs_main.Jan 24 2023, 07:12

Harbormaster completed remote builds in B21824: Diff 37649.Jan 24 2023, 07:21

Fabien accepted this revision.Jan 24 2023, 08:38

This revision is now accepted and ready to land.Jan 24 2023, 08:38

Closed by commit rABC1e299c97637c: Require CBlockIndex::GetBlockPos() to hold mutex cs_main (authored by Jon Atack <jon@atack.com>, committed by PiRK). · Explain WhyJan 24 2023, 09:21

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABC1e299c97637c: Require CBlockIndex::GetBlockPos() to hold mutex cs_main.

Revision Contents
Changeset List

Path

Size

src/

blockindex.h

6 lines

index/

txindex.cpp

2 lines

node/

blockstorage.cpp

11 lines

test/

blockindex_tests.cpp

1 line

fuzz/

chain.cpp

31 lines

util/

blockfilter.cpp

2 lines

wallet/

test/

wallet_tests.cpp

20 lines

Diff 37660

View Options

src/blockindex.h

View Options

src/index/txindex.cpp

View Options

src/node/blockstorage.cpp

View Options

src/test/blockindex_tests.cpp

View Options

src/test/fuzz/chain.cpp

View Options

src/test/util/blockfilter.cpp

View Options

src/wallet/test/wallet_tests.cpp

Require CBlockIndex::GetBlockPos() to hold mutex cs_mainClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 37660

src/blockindex.h

src/index/txindex.cpp

src/node/blockstorage.cpp

src/test/blockindex_tests.cpp

src/test/fuzz/chain.cpp

src/test/util/blockfilter.cpp

src/wallet/test/wallet_tests.cpp

Require CBlockIndex::GetBlockPos() to hold mutex cs_main
ClosedPublic
Actions

Revision Contents
Changeset List