crypto: drbg: use memzero_explicit() for clearing sensitive data
PATCH v2 1/1 crypto: drbg: use memzero_explicit() for clearing sensitive data
Compiler dead store optimization can sometimes remove final calls to memset() used to clear sensitive data at the end of a function. Replace trailing memset() calls with memzero_explicit() to preclude unwanted removal.
---
Changes in v2:
- Move the linux/string.h inclusion to drbg.c
crypto/drbg.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
crypto/drbg.c +12 -11
@@ -98,6 +98,7 @@*/ #include <crypto/drbg.h> +#include <linux/string.h> /*************************************************************** * Backend cipher definitions available to DRBG
@@ -522,9 +523,9 @@ static int drbg_ctr_df(struct drbg_state *drbg, ret =0 ; out: -memset (iv,0 ,drbg_blocklen (drbg)); -memset (temp,0 ,drbg_statelen (drbg)); -memset (pad,0 ,drbg_blocklen (drbg)); +memzero_explicit (iv,drbg_blocklen (drbg)); +memzero_explicit (temp,drbg_statelen (drbg)); +memzero_explicit (pad,drbg_blocklen (drbg));return ret; }
@@ -599,9 +600,9 @@ static int drbg_ctr_update(struct drbg_state *drbg, struct list_head *seed, ret =0 ; out: -memset (temp,0 ,drbg_statelen (drbg) +drbg_blocklen (drbg)); +memzero_explicit (temp,drbg_statelen (drbg) +drbg_blocklen (drbg));if (2 != reseed) -memset (df_data,0 ,drbg_statelen (drbg)); +memzero_explicit (df_data,drbg_statelen (drbg));return ret; }
@@ -660,7 +661,7 @@ static int drbg_ctr_generate(struct drbg_state *drbg, len = ret; out: -memset (drbg->scratchpad,0 ,drbg_blocklen (drbg)); +memzero_explicit (drbg->scratchpad,drbg_blocklen (drbg));return len; }
@@ -848,7 +849,7 @@ static int drbg_hash_df(struct drbg_state *drbg, } out: -memset (tmp,0 ,drbg_blocklen (drbg)); +memzero_explicit (tmp,drbg_blocklen (drbg));return ret; }
@@ -892,7 +893,7 @@ static int drbg_hash_update(struct drbg_state *drbg, struct list_head *seed, ret =drbg_hash_df (drbg, drbg->C,drbg_statelen (drbg), &datalist2); out: -memset (drbg->scratchpad,0 ,drbg_statelen (drbg)); +memzero_explicit (drbg->scratchpad,drbg_statelen (drbg));return ret; }
@@ -927,7 +928,7 @@ static int drbg_hash_process_addtl(struct drbg_state *drbg, drbg->scratchpad, drbg_blocklen(drbg)); out: -memset (drbg->scratchpad,0 ,drbg_blocklen (drbg)); +memzero_explicit (drbg->scratchpad,drbg_blocklen (drbg));return ret; }
@@ -975,7 +976,7 @@ static int drbg_hash_hashgen(struct drbg_state *drbg, } out: -memset (drbg->scratchpad,0 , +memzero_explicit (drbg->scratchpad, (drbg_statelen (drbg) +drbg_blocklen (drbg)));return len; }
@@ -1024,7 +1025,7 @@ static int drbg_hash_generate(struct drbg_state *drbg,drbg_add_buf (drbg->V,drbg_statelen (drbg), u.req,8 ); out: -memset (drbg->scratchpad,0 ,drbg_blocklen (drbg)); +memzero_explicit (drbg->scratchpad,drbg_blocklen (drbg));return len; }
Signature · 1 line
1.9.1
Herbert Xu
maintainerQuoted 6 lines · Nickolaus Woodruff
Compiler dead store optimization can sometimes remove final calls to
memset()used to clear sensitive data at the end of a function. Replace trailingmemset()calls withmemzero_explicit()to preclude unwanted removal.Signed-off-by Nickolaus Woodruff <[email protected]>
Patch applied. 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
Herbert Xu
maintainerQuoted 9 lines · Herbert Xu
Quoted 6 lines · Nickolaus Woodruff
Compiler dead store optimization can sometimes remove final calls to
memset()used to clear sensitive data at the end of a function. Replace trailingmemset()calls withmemzero_explicit()to preclude unwanted removal.Signed-off-by Nickolaus Woodruff <[email protected]>Patch applied. Thanks!
Actually I'm reverting this because the patch was bogus. None of the data zeroed are on the stack.
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