diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-11-30 12:03:44 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-12-02 09:55:49 -0500 |
commit | a6326ba025a4bc025c8c9a15ea2f307936a93843 (patch) | |
tree | b202228823f26c0452b882ffe12a1928ca549853 /arch/x86/crypto | |
parent | 8202cd720637e891639bf8e4af00d5431553c5b9 (diff) |
crypto: sha - replace memset by memzero_explicit
Memset on a local variable may be removed when it is called just before the
variable goes out of scope. Using memzero_explicit defeats this
optimization. A simplified version of the semantic patch that makes this
change is as follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier x;
type T;
@@
{
... when any
T x[...];
... when any
when exists
- memset
+ memzero_explicit
(x,
-0,
...)
... when != x
when strict
}
// </smpl>
This change was suggested by Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto')
-rw-r--r-- | arch/x86/crypto/sha256_ssse3_glue.c | 2 | ||||
-rw-r--r-- | arch/x86/crypto/sha512_ssse3_glue.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c index 4dc100d82902..8fad72f4dfd2 100644 --- a/arch/x86/crypto/sha256_ssse3_glue.c +++ b/arch/x86/crypto/sha256_ssse3_glue.c | |||
@@ -211,7 +211,7 @@ static int sha224_ssse3_final(struct shash_desc *desc, u8 *hash) | |||
211 | sha256_ssse3_final(desc, D); | 211 | sha256_ssse3_final(desc, D); |
212 | 212 | ||
213 | memcpy(hash, D, SHA224_DIGEST_SIZE); | 213 | memcpy(hash, D, SHA224_DIGEST_SIZE); |
214 | memset(D, 0, SHA256_DIGEST_SIZE); | 214 | memzero_explicit(D, SHA256_DIGEST_SIZE); |
215 | 215 | ||
216 | return 0; | 216 | return 0; |
217 | } | 217 | } |
diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c index 26a5898a6f26..0b6af26832bf 100644 --- a/arch/x86/crypto/sha512_ssse3_glue.c +++ b/arch/x86/crypto/sha512_ssse3_glue.c | |||
@@ -219,7 +219,7 @@ static int sha384_ssse3_final(struct shash_desc *desc, u8 *hash) | |||
219 | sha512_ssse3_final(desc, D); | 219 | sha512_ssse3_final(desc, D); |
220 | 220 | ||
221 | memcpy(hash, D, SHA384_DIGEST_SIZE); | 221 | memcpy(hash, D, SHA384_DIGEST_SIZE); |
222 | memset(D, 0, SHA512_DIGEST_SIZE); | 222 | memzero_explicit(D, SHA512_DIGEST_SIZE); |
223 | 223 | ||
224 | return 0; | 224 | return 0; |
225 | } | 225 | } |