From: "Yan, Zheng" <zheng.z.yan@intel.com>
To: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"davem@davemloft.net" <davem@davemloft.net>,
yoshfuji@linux-ipv6.org
Subject: [PATCH] tcp: properly release md5sig_pool references
Date: Mon, 26 Sep 2011 10:35:09 +0800 [thread overview]
Message-ID: <4E7FE4DD.5070804@intel.com> (raw)
tcp_v4_md5_do_add() increases use count of md5sig_pool by one for
each tcp md5sig peer, so we should call tcp_free_md5sig_pool() for
each peer when destroying the socket.
Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
---
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index c34f015..3ca72ae 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1007,10 +1007,11 @@ static void tcp_v4_clear_md5_list(struct sock *sk)
*/
if (tp->md5sig_info->entries4) {
int i;
- for (i = 0; i < tp->md5sig_info->entries4; i++)
+ for (i = 0; i < tp->md5sig_info->entries4; i++) {
kfree(tp->md5sig_info->keys4[i].base.key);
+ tcp_free_md5sig_pool();
+ }
tp->md5sig_info->entries4 = 0;
- tcp_free_md5sig_pool();
}
if (tp->md5sig_info->keys4) {
kfree(tp->md5sig_info->keys4);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 3c9fa61..9dcef7c 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -668,10 +668,11 @@ static void tcp_v6_clear_md5_list (struct sock *sk)
int i;
if (tp->md5sig_info->entries6) {
- for (i = 0; i < tp->md5sig_info->entries6; i++)
+ for (i = 0; i < tp->md5sig_info->entries6; i++) {
kfree(tp->md5sig_info->keys6[i].base.key);
+ tcp_free_md5sig_pool();
+ }
tp->md5sig_info->entries6 = 0;
- tcp_free_md5sig_pool();
}
kfree(tp->md5sig_info->keys6);
@@ -679,10 +680,11 @@ static void tcp_v6_clear_md5_list (struct sock *sk)
tp->md5sig_info->alloced6 = 0;
if (tp->md5sig_info->entries4) {
- for (i = 0; i < tp->md5sig_info->entries4; i++)
+ for (i = 0; i < tp->md5sig_info->entries4; i++) {
kfree(tp->md5sig_info->keys4[i].base.key);
+ tcp_free_md5sig_pool();
+ }
tp->md5sig_info->entries4 = 0;
- tcp_free_md5sig_pool();
}
kfree(tp->md5sig_info->keys4);
next reply other threads:[~2011-09-26 2:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-26 2:35 Yan, Zheng [this message]
2011-09-26 6:26 ` [PATCH] tcp: properly release md5sig_pool references Eric Dumazet
2011-09-26 8:11 ` Yan, Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E7FE4DD.5070804@intel.com \
--to=zheng.z.yan@intel.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox