Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7185ad26 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Theodore Ts'o
Browse files

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 strict

Therefore, make use of the drop-in replacement memzero_explicit() for
exactly such cases instead of using memset().

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent d4c5efdb

crypto/cts.c

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}