| From foo@baz Wed Sep 26 11:28:02 CEST 2018 |
| From: Sabrina Dubroca <sd@queasysnail.net> |
| Date: Wed, 12 Sep 2018 17:44:43 +0200 |
| Subject: tls: clear key material from kernel memory when do_tls_setsockopt_conf fails |
| |
| From: Sabrina Dubroca <sd@queasysnail.net> |
| |
| [ Upstream commit c844eb46b7d43c2cf760169df5ae1d5b033af338 ] |
| |
| Fixes: 3c4d7559159b ("tls: kernel TLS support") |
| Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> |
| Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/tls/tls_main.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/tls/tls_main.c |
| +++ b/net/tls/tls_main.c |
| @@ -425,7 +425,7 @@ static int do_tls_setsockopt_tx(struct s |
| goto out; |
| |
| err_crypto_info: |
| - memset(crypto_info, 0, sizeof(*crypto_info)); |
| + memzero_explicit(crypto_info, sizeof(union tls_crypto_context)); |
| out: |
| return rc; |
| } |
