Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up all known races/platform-specific UB at the time PR was opened #9708

Merged
merged 10 commits into from
Feb 11, 2017
+105 −45
Merged

Clean up all known races/platform-specific UB at the time PR was opened #9708

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
321d0fc
net: fix a few races. Credit @TheBlueMatt
theuni Feb 6, 2017
644f123
Make nTimeConnected const in CNode
TheBlueMatt Feb 6, 2017
ae683c1
Avoid copying CNodeStats to make helgrind OK with buggy std::string
TheBlueMatt Feb 6, 2017
512731b
Access fRelayTxes with cs_filter lock in copyStats
TheBlueMatt Feb 6, 2017
96f42d8
Make nStartingHeight atomic
TheBlueMatt Feb 6, 2017
0f31872
Make nServices atomic
TheBlueMatt Feb 6, 2017
22b4966
Move [clean|str]SubVer writes/copyStats into a lock
TheBlueMatt Feb 6, 2017
d8f2b8a
Make nTimeBestReceived atomic
TheBlueMatt Feb 6, 2017
036073b
Move CNode::addrName accesses behind locked accessors
TheBlueMatt Feb 6, 2017
db2dc7a
Move CNode::addrLocal access behind locked accessors
TheBlueMatt Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move [clean|str]SubVer writes/copyStats into a lock
  • Loading branch information
@TheBlueMatt
TheBlueMatt committed Feb 10, 2017
commit 22b4966a29501c4f3f2e970ac5008fbd91e665a9
5 changes: 4 additions & 1 deletion src/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,10 @@ void CNode::copyStats(CNodeStats &stats)
X(nTimeOffset);
X(addrName);
X(nVersion);
X(cleanSubVer);
{
LOCK(cs_SubVer);
X(cleanSubVer);
}
X(fInbound);
X(fAddnode);
X(nStartingHeight);
Expand Down
1 change: 1 addition & 0 deletions src/net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ class CNode
// store the sanitized version in cleanSubVer. The original should be used when dealing with
// the network or wire types and the cleaned string used when displayed or logged.
std::string strSubVer, cleanSubVer;
CCriticalSection cs_SubVer; // used for both cleanSubVer and strSubVer
bool fWhitelisted; // This peer can bypass DoS banning.
bool fFeeler; // If true this node is being used as a short lived feeler.
bool fOneShot;
Expand Down
11 changes: 8 additions & 3 deletions src/net_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
int nVersion;
int nSendVersion;
std::string strSubVer;
std::string cleanSubVer;
int nStartingHeight = -1;
bool fRelay = true;

Expand Down Expand Up @@ -1246,6 +1247,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
vRecv >> addrFrom >> nNonce;
if (!vRecv.empty()) {
vRecv >> LIMITED_STRING(strSubVer, MAX_SUBVERSION_LENGTH);
cleanSubVer = SanitizeString(strSubVer);
}
if (!vRecv.empty()) {
vRecv >> nStartingHeight;
Expand Down Expand Up @@ -1273,8 +1275,11 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr

pfrom->nServices = nServices;
pfrom->addrLocal = addrMe;
pfrom->strSubVer = strSubVer;
pfrom->cleanSubVer = SanitizeString(strSubVer);
{
LOCK(pfrom->cs_SubVer);
pfrom->strSubVer = strSubVer;
pfrom->cleanSubVer = cleanSubVer;
}
pfrom->nStartingHeight = nStartingHeight;
pfrom->fClient = !(nServices & NODE_NETWORK);
{
Expand Down Expand Up @@ -1330,7 +1335,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
remoteAddr = ", peeraddr=" + pfrom->addr.ToString();

LogPrintf("receive version message: %s: version %d, blocks=%d, us=%s, peer=%d%s\n",
pfrom->cleanSubVer, pfrom->nVersion,
cleanSubVer, pfrom->nVersion,
pfrom->nStartingHeight, addrMe.ToString(), pfrom->id,
remoteAddr);

Expand Down