summaryrefslogtreecommitdiffstats
path: root/net/tls
diff options
context:
space:
mode:
authorXiyu Yang <xiyuyang19@fudan.edu.cn>2020-04-25 21:10:23 +0800
committerDavid S. Miller <davem@davemloft.net>2020-04-27 11:22:38 -0700
commit62b4011fa7bef9fa00a6aeec26e69685dc1cc21e (patch)
tree2da8358a87aa37f0b3b8ea2a7c65a0370c669063 /net/tls
parent4becb7ee5b3d2829ed7b9261a245a77d5b7de902 (diff)
downloadlinux-62b4011fa7bef9fa00a6aeec26e69685dc1cc21e.tar.gz
linux-62b4011fa7bef9fa00a6aeec26e69685dc1cc21e.tar.bz2
linux-62b4011fa7bef9fa00a6aeec26e69685dc1cc21e.zip
net/tls: Fix sk_psock refcnt leak when in tls_data_ready()
tls_data_ready() invokes sk_psock_get(), which returns a reference of the specified sk_psock object to "psock" with increased refcnt. When tls_data_ready() returns, local variable "psock" becomes invalid, so the refcount should be decreased to keep refcount balanced. The reference counting issue happens in one exception handling path of tls_data_ready(). When "psock->ingress_msg" is empty but "psock" is not NULL, the function forgets to decrease the refcnt increased by sk_psock_get(), causing a refcnt leak. Fix this issue by calling sk_psock_put() on all paths when "psock" is not NULL. Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls')
-rw-r--r--net/tls/tls_sw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 704313dd082f..e23f94a5549b 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2083,8 +2083,9 @@ static void tls_data_ready(struct sock *sk)
strp_data_ready(&ctx->strp);
psock = sk_psock_get(sk);
- if (psock && !list_empty(&psock->ingress_msg)) {
- ctx->saved_data_ready(sk);
+ if (psock) {
+ if (!list_empty(&psock->ingress_msg))
+ ctx->saved_data_ready(sk);
sk_psock_put(sk, psock);
}
}