|
11 | 11 | #include <Windows.h> // For SecureZeroMemory.
|
12 | 12 | #endif
|
13 | 13 |
|
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 |
| - */ |
31 | 14 | void memory_cleanse(void *ptr, size_t len)
|
32 | 15 | {
|
33 | 16 | #if defined(_MSC_VER)
|
| 17 | + /* SecureZeroMemory is guaranteed not to be optimized out by MSVC. */ |
34 | 18 | SecureZeroMemory(ptr, len);
|
35 | 19 | #else
|
36 | 20 | std::memset(ptr, 0, len);
|
37 | 21 |
|
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 | + */ |
41 | 33 | __asm__ __volatile__("" : : "r"(ptr) : "memory");
|
42 | 34 | #endif
|
43 | 35 | }
|
0 commit comments