Skip to content

Commit f53a70c

Browse files
Improve documentation of memory_cleanse()
So far, the documentation of memory_cleanse() is a verbatim copy of the commit message in BoringSSL, where this code was originally written. However, our code evolved since then, and the commit message is not particularly helpful in the code but is rather of historical interested in BoringSSL only. This commit improves improves the comments around memory_cleanse() and gives a better rationale for the method that we use. This commit touches only comments.
1 parent cac30a4 commit f53a70c

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

src/support/cleanse.cpp

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,25 @@
1111
#include <Windows.h> // For SecureZeroMemory.
1212
#endif
1313

14-
/* Compilers have a bad habit of removing "superfluous" memset calls that
15-
* are trying to zero memory. For example, when memset()ing a buffer and
16-
* then free()ing it, the compiler might decide that the memset is
17-
* unobservable and thus can be removed.
18-
*
19-
* Previously we used OpenSSL which tried to stop this by a) implementing
20-
* memset in assembly on x86 and b) putting the function in its own file
21-
* for other platforms.
22-
*
23-
* This change removes those tricks in favour of using asm directives to
24-
* scare the compiler away. As best as our compiler folks can tell, this is
25-
* sufficient and will continue to be so.
26-
*
27-
* Adam Langley <[email protected]>
28-
* Commit: ad1907fe73334d6c696c8539646c21b11178f20f
29-
* BoringSSL (LICENSE: ISC)
30-
*/
3114
void memory_cleanse(void *ptr, size_t len)
3215
{
3316
#if defined(_MSC_VER)
17+
/* SecureZeroMemory is guaranteed not to be optimized out by MSVC. */
3418
SecureZeroMemory(ptr, len);
3519
#else
3620
std::memset(ptr, 0, len);
3721

38-
/* As best as we can tell, this is sufficient to break any optimisations that
39-
might try to eliminate "superfluous" memsets. If there's an easy way to
40-
detect memset_s, it would be better to use that. */
22+
/* Memory barrier that scares the compiler away from optimizing out the memset.
23+
*
24+
* Quoting Adam Langley <[email protected]> in commit ad1907fe73334d6c696c8539646c21b11178f20f
25+
* in BoringSSL (ISC License):
26+
* As best as we can tell, this is sufficient to break any optimisations that
27+
* might try to eliminate "superfluous" memsets.
28+
* This method is used in memzero_explicit() the Linux kernel, too. Its advantage is that it
29+
* is pretty efficient because the compiler can still implement the memset() efficiently,
30+
* just not remove it entirely. See "Dead Store Elimination (Still) Considered Harmful" by
31+
* Yang et al. (USENIX Security 2017) for more background.
32+
*/
4133
__asm__ __volatile__("" : : "r"(ptr) : "memory");
4234
#endif
4335
}

src/support/cleanse.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#include <stdlib.h>
1010

11-
// Attempt to overwrite data in the specified memory span.
11+
/** Secure overwrite a buffer (possibly containing secret data) with zero-bytes. The write
12+
* operation will not be optimized out by the compiler. */
1213
void memory_cleanse(void *ptr, size_t len);
1314

1415
#endif // BITCOIN_SUPPORT_CLEANSE_H

0 commit comments

Comments
 (0)