diff options
| author |   Vakul Garg <vakul.garg@nxp.com> | 2018-09-25 20:21:51 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-25 10:46:59 -0700 |
| commit | c774973e91e1f08c58bb25c950a30252cfde650c (patch) | |
| tree | e32f6a52ca75b0c1586017cca6ba67640a220937 /net/tls/tls_sw.c | |
| parent | tls: Fix socket mem accounting error under async encryption (diff) | |
| download | linux-dev-c774973e91e1f08c58bb25c950a30252cfde650c.tar.xz linux-dev-c774973e91e1f08c58bb25c950a30252cfde650c.zip | |
tls: Fixed a memory leak during socket close
During socket close, if there is a open record with tx context, it needs
to be be freed apart from freeing up plaintext and encrypted scatter
lists. This patch frees up the open record if present in tx context.
Also tls_free_both_sg() has been renamed to tls_free_open_rec() to
indicate that the free record in tx context is being freed inside the
function.
Fixes: a42055e8d2c3 ("net/tls: Add support for async encryption")
Signed-off-by: Vakul Garg <vakul.garg@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/tls/tls_sw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 406d3bb98818..4c18b4dba284 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -310,7 +310,7 @@ static void free_sg(struct sock *sk, struct scatterlist *sg, *sg_size = 0; } -static void tls_free_both_sg(struct sock *sk) +static void tls_free_open_rec(struct sock *sk) { struct tls_context *tls_ctx = tls_get_ctx(sk); struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx); @@ -327,6 +327,8 @@ static void tls_free_both_sg(struct sock *sk) free_sg(sk, rec->sg_plaintext_data, &rec->sg_plaintext_num_elem, &rec->sg_plaintext_size); + + kfree(rec); } int tls_tx_records(struct sock *sk, int flags) @@ -1591,7 +1593,7 @@ void tls_sw_free_resources_tx(struct sock *sk) } crypto_free_aead(ctx->aead_send); - tls_free_both_sg(sk); + tls_free_open_rec(sk); kfree(ctx); } |