hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: a42055e8d2 ("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>
This commit is contained in:
Vakul Garg 2018-09-25 20:21:51 +05:30 committed by David S. Miller
parent b85135b595
commit c774973e91
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/tls/tls_sw.c
View File

@ -310,7 +310,7 @@ static void free_sg(struct sock *sk, struct scatterlist *sg,
*sg_size = 0; *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_context *tls_ctx = tls_get_ctx(sk);
struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx); 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, free_sg(sk, rec->sg_plaintext_data,
&rec->sg_plaintext_num_elem, &rec->sg_plaintext_num_elem,
&rec->sg_plaintext_size); &rec->sg_plaintext_size);
kfree(rec);
} }
int tls_tx_records(struct sock *sk, int flags) 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); crypto_free_aead(ctx->aead_send);
tls_free_both_sg(sk); tls_free_open_rec(sk);
kfree(ctx); kfree(ctx);
} }