diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-11-30 12:03:43 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-12-02 09:55:48 -0500 |
commit | 8202cd720637e891639bf8e4af00d5431553c5b9 (patch) | |
tree | 4950fd9f0b16737857ac46e347334ad6e33ad6d7 /arch/sparc | |
parent | f26b7b8052daee7ba8bc3f732aa2c20e8c69aea6 (diff) |
crypto: sparc - 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/sparc')
-rw-r--r-- | arch/sparc/crypto/sha256_glue.c | 2 | ||||
-rw-r--r-- | arch/sparc/crypto/sha512_glue.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/crypto/sha256_glue.c b/arch/sparc/crypto/sha256_glue.c index 41f27cca2a22..285268ca9279 100644 --- a/arch/sparc/crypto/sha256_glue.c +++ b/arch/sparc/crypto/sha256_glue.c | |||
@@ -135,7 +135,7 @@ static int sha224_sparc64_final(struct shash_desc *desc, u8 *hash) | |||
135 | sha256_sparc64_final(desc, D); | 135 | sha256_sparc64_final(desc, D); |
136 | 136 | ||
137 | memcpy(hash, D, SHA224_DIGEST_SIZE); | 137 | memcpy(hash, D, SHA224_DIGEST_SIZE); |
138 | memset(D, 0, SHA256_DIGEST_SIZE); | 138 | memzero_explicit(D, SHA256_DIGEST_SIZE); |
139 | 139 | ||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
diff --git a/arch/sparc/crypto/sha512_glue.c b/arch/sparc/crypto/sha512_glue.c index 9fff88541b8c..11eb36c3fc8c 100644 --- a/arch/sparc/crypto/sha512_glue.c +++ b/arch/sparc/crypto/sha512_glue.c | |||
@@ -139,7 +139,7 @@ static int sha384_sparc64_final(struct shash_desc *desc, u8 *hash) | |||
139 | sha512_sparc64_final(desc, D); | 139 | sha512_sparc64_final(desc, D); |
140 | 140 | ||
141 | memcpy(hash, D, 48); | 141 | memcpy(hash, D, 48); |
142 | memset(D, 0, 64); | 142 | memzero_explicit(D, 64); |
143 | 143 | ||
144 | return 0; | 144 | return 0; |
145 | } | 145 | } |