crypto: memzero_explicit - make sure to clear out sensitive data
PATCH v2 1/1 crypto: memzero_explicit - make sure to clear out sensitive data
Recently, in commit 13aa93c70e71 ("random: add and use memzero_explicit() for clearing data"), we have found that GCC may optimize some memset() cases away when it detects a stack variable is not being used anymore and going out of scope. This can happen, for example, in cases when we are clearing out sensitive information such as keying material or any e.g. intermediate results from crypto computations, etc.
With the help of Coccinelle, we can figure out and fix such occurences in the crypto subsytem as well. Julia Lawall provided the following Coccinelle program:
@@
type T;
identifier x;
@@
T x;
... when exists
when any
-memset
+memzero_explicit
(&x,
-0,
...) ... when != x
when strict
@@
type T;
identifier x;
@@
T x[...];
... when exists
when any
-memset
+memzero_explicit
(x,
-0,
...)
... when != x
when strictTherefore, make use of the drop-in replacement memzero_explicit() for exactly such cases instead of using memset().
---
v1 -> v2:
- There was one more non-array case in vmac.c
Herbert, Ted, I have posted my original patch that introduces memzero_explicit() infrastructure along with its first users that fixes such occurences to Ted's random tree [1].
That means, this one last patch on that regard would be on top of it as an outcome of an audit in the crypto subsystem. Would the two of you be okay, if Ted takes it to random as well (since the random fix is not yet in mainline)? Changes are minimal and rather uncomplicated, but I think it would be quite important to get fixed. Thanks!
crypto/cts.c | 3 ++- crypto/sha1_generic.c | 2 +- crypto/sha256_generic.c | 5 ++--- crypto/sha512_generic.c | 2 +- crypto/tgr192.c | 4 ++-- crypto/vmac.c | 2 +- crypto/wp512.c | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-)
crypto/cts.c +2 -1
@@ -202,7 +202,8 @@ static int cts_cbc_decrypt(struct crypto_cts_ctx *ctx,/* 5. Append the tail (BB - Ln) bytes of Xn (tmp) to Cn to create En */ memcpy (s + bsize + lastn, tmp + lastn, bsize - lastn);/* 6. Decrypt En to create Pn-1 */ -memset (iv,0 ,sizeof (iv)); +memzero_explicit (iv,sizeof (iv)); +sg_set_buf (&sgsrc[0 ], s + bsize, bsize);sg_set_buf (&sgdst[0 ], d, bsize); err =crypto_blkcipher_decrypt_iv (&lcldesc, sgdst, sgsrc, bsize);
crypto/sha1_generic.c +1 -1
@@ -64,7 +64,7 @@ int crypto_sha1_update(struct shash_desc *desc, const u8 *data, src = data + done; }while (done +SHA1_BLOCK_SIZE <= len); -memset (temp,0 ,sizeof (temp)); +memzero_explicit (temp,sizeof (temp)); partial =0 ; }memcpy (sctx->buffer + partial, src, len - done);
crypto/sha256_generic.c +2 -3
@@ -210,10 +210,9 @@ static void sha256_transform(u32 *state, const u8 *input)/* clear any sensitive info... */ a = b = c = d = e = f = g = h = t1 = t2 =0 ; -memset (W ,0 ,64 *sizeof (u32)); +memzero_explicit (W ,64 *sizeof (u32)); } -static int sha224_init (struct shash_desc *desc) {struct sha256_state *sctx =shash_desc_ctx (desc);
@@ -316,7 +315,7 @@ static int sha224_final(struct shash_desc *desc, u8 *hash)sha256_final (desc,D );memcpy (hash,D ,SHA224_DIGEST_SIZE ); -memset (D ,0 ,SHA256_DIGEST_SIZE ); +memzero_explicit (D ,SHA256_DIGEST_SIZE );return 0 ; }
crypto/sha512_generic.c +1 -1
@@ -238,7 +238,7 @@ static int sha384_final(struct shash_desc *desc, u8 *hash)sha512_final (desc,D );memcpy (hash,D ,48 ); -memset (D ,0 ,64 ); +memzero_explicit (D ,64 );return 0 ; }
crypto/tgr192.c +2 -2
@@ -612,7 +612,7 @@ static int tgr160_final(struct shash_desc *desc, u8 * out)tgr192_final (desc,D );memcpy (out,D ,TGR160_DIGEST_SIZE ); -memset (D ,0 ,TGR192_DIGEST_SIZE ); +memzero_explicit (D ,TGR192_DIGEST_SIZE );return 0 ; }
@@ -623,7 +623,7 @@ static int tgr128_final(struct shash_desc *desc, u8 * out)tgr192_final (desc,D );memcpy (out,D ,TGR128_DIGEST_SIZE ); -memset (D ,0 ,TGR192_DIGEST_SIZE ); +memzero_explicit (D ,TGR192_DIGEST_SIZE );return 0 ; }
crypto/vmac.c +1 -1
@@ -613,7 +613,7 @@ static int vmac_final(struct shash_desc *pdesc, u8 *out) } mac =vmac (ctx->partial, ctx->partial_size, nonce,NULL , ctx);memcpy (out, &mac,sizeof (vmac_t)); -memset (&mac,0 ,sizeof (vmac_t)); +memzero_explicit (&mac,sizeof (vmac_t));memset (&ctx->__vmac_ctx,0 ,sizeof (struct vmac_ctx )); ctx->partial_size =0 ;return 0 ;
crypto/wp512.c +4 -4
@@ -1102,8 +1102,8 @@ static int wp384_final(struct shash_desc *desc, u8 *out)u8 D [64 ];wp512_final (desc,D ); -memcpy (out,D ,WP384_DIGEST_SIZE ); -memset (D ,0 ,WP512_DIGEST_SIZE ); +memcpy (out,D ,WP384_DIGEST_SIZE ); +memzero_explicit (D ,WP512_DIGEST_SIZE );return 0 ; }
@@ -1113,8 +1113,8 @@ static int wp256_final(struct shash_desc *desc, u8 *out)u8 D [64 ];wp512_final (desc,D ); -memcpy (out,D ,WP256_DIGEST_SIZE ); -memset (D ,0 ,WP512_DIGEST_SIZE ); +memcpy (out,D ,WP256_DIGEST_SIZE ); +memzero_explicit (D ,WP512_DIGEST_SIZE );return 0 ; }
Signature · 1 line
1.7.11.7
Quoted 32 lines · Daniel Borkmann
Recently, in commit
13aa93c70e71("random: add and usememzero_explicit()for clearing data"), we have found that GCC may optimize somememset()cases away when it detects a stack variable is not being used anymore and going out of scope. This can happen, for example, in cases when we are clearing out sensitive information such as keying material or any e.g. intermediate results from crypto computations, etc.With the help of Coccinelle, we can figure out and fix such occurences in the crypto subsytem as well. Julia Lawall provided the following Coccinelle program:
@@
type T;
identifier x;
@@T x;
... when exists
when any
-memset
+memzero_explicit(&x, -0, ...)... when != x
when strict@@
type T;
identifier x;
@@
Quoted 10 lines
T x[...];
... when exists
when any
-memset
+memzero_explicit
(x,
-0,
...)
... when != x
when strictI think this Coccinelle patch won't make it completely unnecessary for a manual audit as it does not take optimizations (dead code eliminitation) into account?
Quoted 9 lines
Therefore, make use of the drop-in replacement
memzero_explicit()for exactly such cases instead of usingmemset().Signed-off-by Daniel Borkmann <[email protected]>Cc Julia Lawall <[email protected]>Cc Herbert Xu <[email protected]>Cc Theodore Ts'o <[email protected]>Cc Hannes Frederic Sowa <[email protected]>
Thanks,
Hannes
Quoted 44 lines · Hannes Frederic Sowa
Quoted 32 lines · Daniel Borkmann
Recently, in commit
13aa93c70e71("random: add and usememzero_explicit()for clearing data"), we have found that GCC may optimize somememset()cases away when it detects a stack variable is not being used anymore and going out of scope. This can happen, for example, in cases when we are clearing out sensitive information such as keying material or any e.g. intermediate results from crypto computations, etc.With the help of Coccinelle, we can figure out and fix such occurences in the crypto subsytem as well. Julia Lawall provided the following Coccinelle program:
@@
type T;
identifier x;
@@T x;
... when exists
when any
-memset
+memzero_explicit(&x, -0, ...)... when != x
when strict@@
type T;
identifier x;
@@Quoted 10 lines
T x[...]; ... when exists when any -memset +memzero_explicit (x, -0, ...) ... when != x when strict
Quoted 3 lines
I think this Coccinelle patch won't make it completely unnecessary for a manual audit as it does not take optimizations (dead code eliminitation) into account?
I agree. If you see something else that could be taken into account in the semantic patch, please let me know.
julia
Quoted 18 lines
Quoted 10 lines
Therefore, make use of the drop-in replacement
memzero_explicit()for exactly such cases instead of usingmemset().Signed-off-by Daniel Borkmann <[email protected]>Cc Julia Lawall <[email protected]>Cc Herbert Xu <[email protected]>Cc Theodore Ts'o <[email protected]>Cc Hannes Frederic Sowa <[email protected]>Thanks,
Hannes
Quoted 45 lines · Julia Lawall
Quoted 44 lines · Hannes Frederic Sowa
Quoted 42 lines · Daniel Borkmann
Recently, in commit
13aa93c70e71("random: add and usememzero_explicit()for clearing data"), we have found that GCC may optimize somememset()cases away when it detects a stack variable is not being used anymore and going out of scope. This can happen, for example, in cases when we are clearing out sensitive information such as keying material or any e.g. intermediate results from crypto computations, etc.With the help of Coccinelle, we can figure out and fix such occurences in the crypto subsytem as well. Julia Lawall provided the following Coccinelle program:
@@ type T; identifier x; @@ T x; ... when exists when any -memset +memzero_explicit (&x, -0, ...) ... when != x when strict @@ type T; identifier x; @@ T x[...]; ... when exists when any -memset +memzero_explicit (x, -0, ...) ... when != x when strict
Quoted 6 lines
Quoted 3 lines
I think this Coccinelle patch won't make it completely unnecessary for a manual audit as it does not take optimizations (dead code eliminitation) into account?
I agree. If you see something else that could be taken into account in the semantic patch, please let me know.
Agreed, the code would fix the obvious candidates that would need memzero_explicit() though. It also found the already fixed spots for the random driver when I reran the script in that area, so I think it's a good starting point nevertheless.
...
Quoted 13 lines
Quoted 13 lines
Quoted 8 lines
Therefore, make use of the drop-in replacement
memzero_explicit()for exactly such cases instead of usingmemset().Signed-off-by Daniel Borkmann <[email protected]>Cc Julia Lawall <[email protected]>Cc Herbert Xu <[email protected]>Cc Theodore Ts'o <[email protected]>Cc Hannes Frederic Sowa <[email protected]>Thanks,
Hannes
Quoted 43 lines · Daniel Borkmann
Recently, in commit
13aa93c70e71("random: add and usememzero_explicit()for clearing data"), we have found that GCC may optimize somememset()cases away when it detects a stack variable is not being used anymore and going out of scope. This can happen, for example, in cases when we are clearing out sensitive information such as keying material or any e.g. intermediate results from crypto computations, etc.With the help of Coccinelle, we can figure out and fix such occurences in the crypto subsytem as well. Julia Lawall provided the following Coccinelle program:
@@
type T;
identifier x;
@@T x;
... when exists
when any
-memset
+memzero_explicit(&x, -0, ...)... when != x
when strict@@
type T;
identifier x;
@@T x[...]; ... when exists when any -memset +memzero_explicit (x, -0, ...) ... when != x when strict
Quoted 8 lines
Therefore, make use of the drop-in replacement
memzero_explicit()for exactly such cases instead of usingmemset().Signed-off-by Daniel Borkmann <[email protected]>Cc Julia Lawall <[email protected]>Cc Herbert Xu <[email protected]>Cc Theodore Ts'o <[email protected]>Cc Hannes Frederic Sowa <[email protected]>
Thanks,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Ted,
Quoted 53 lines · Herbert Xu
Quoted 43 lines · Daniel Borkmann
Recently, in commit
13aa93c70e71("random: add and usememzero_explicit()for clearing data"), we have found that GCC may optimize somememset()cases away when it detects a stack variable is not being used anymore and going out of scope. This can happen, for example, in cases when we are clearing out sensitive information such as keying material or any e.g. intermediate results from crypto computations, etc.With the help of Coccinelle, we can figure out and fix such occurences in the crypto subsytem as well. Julia Lawall provided the following Coccinelle program:
@@ type T; identifier x; @@ T x; ... when exists when any -memset +memzero_explicit (&x, -0, ...) ... when != x when strict @@ type T; identifier x; @@ T x[...]; ... when exists when any -memset +memzero_explicit (x, -0, ...) ... when != x when strictQuoted 8 lines
Therefore, make use of the drop-in replacement
memzero_explicit()for exactly such cases instead of usingmemset().Signed-off-by Daniel Borkmann <[email protected]>Cc Julia Lawall <[email protected]>Cc Herbert Xu <[email protected]>Cc Theodore Ts'o <[email protected]>Cc Hannes Frederic Sowa <[email protected]>
Quoted 3 lines
Acked-by Herbert Xu <[email protected]>Thanks,
Sorry for the noise, but given Herbert acked the patch and in the random tree the infrastructure is at current present to fix this security issue, could you take it through random tree as originally proposed between the "---" and diffstat line of this patch [1]?
Thanks a lot,
Daniel