random: fix crash on some 64bit platforms #10614

pull theuni wants to merge 1 commits into bitcoin:master from theuni:fix-osx-crash changing 1 files +8 −2

theuni commented at 7:01 PM on June 16, 2017: member

Fixes #10611. Credit @sipa.

rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash in particular, it was holding a stack canary which was not properly restored after the cpuid.

Split out the x86+PIC case so that x86_64 doesn't have to worry about it.
sipa commented at 7:04 PM on June 16, 2017: member

utACK b9b87481fd69e5caa15f580a19a5e0a58ad5f6a6

random: fix crash on some 64bit platforms

rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash
in particular, it was holding a stack canary which was not properly restored
after the cpuid.

Split out the x86+PIC case so that x86_64 doesn't have to worry about it.

9af207c810

in src/random.cpp:75 in b9b87481fd outdated
```
  72 | @@ -73,9 +73,15 @@ static constexpr uint32_t CPUID_F1_ECX_RDRAND = 0x40000000;
  73 |  static void RDRandInit()
  74 |  {
  75 |      //! When calling cpuid function #1, ecx register will have this set if RDRAND is available.
```
sipa commented at 7:06 PM on June 16, 2017:

While you're at it, can you move this comment down to after the #endif? It's intended to clarify the CPUID_F1_ECX_RDRAND constant.

theuni commented at 7:19 PM on June 16, 2017:

Done
theuni force-pushed on Jun 16, 2017
jonasschnelli commented at 7:34 PM on June 16, 2017: contributor

tested ACK 9af207c810b5c4b09ccbdec75582b3e34e32e8cc (OSX 10.12 only) full static build via gitian: https://bitcoin.jonasschnelli.ch/build/181 Confirmed that it fixes #10611
sipa commented at 9:30 PM on June 16, 2017: member

utACK 9af207c810b5c4b09ccbdec75582b3e34e32e8cc
sipa commented at 11:40 PM on June 16, 2017: member

Fixes #10611. Credit @sipa.

You can also add a blame for introducing the bug in the first place.
gmaxwell approved
gmaxwell commented at 12:28 AM on June 17, 2017: contributor

utACK
sipa merged this on Jun 17, 2017
sipa closed this on Jun 17, 2017
sipa referenced this in commit cafe24f039 on Jun 17, 2017
PastaPastaPasta referenced this in commit 21b0afaf0f on Jul 5, 2019
PastaPastaPasta referenced this in commit 62188441d0 on Jul 5, 2019
PastaPastaPasta referenced this in commit 17e621dd23 on Jul 6, 2019
PastaPastaPasta referenced this in commit fc40c0a97c on Jul 8, 2019
PastaPastaPasta referenced this in commit b73dc48b77 on Jul 9, 2019
PastaPastaPasta referenced this in commit 5ac6d7c4e5 on Jul 9, 2019
barrystyle referenced this in commit eacee67e0b on Jan 22, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Linked (view graph)

#10611 Gitian build (current master) crashes on OSX