From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Dmitry Safonov <dima@arista.com>,
Andy Lutomirski <luto@amacapital.net>,
David Ahern <dsahern@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Francesco Ruggeri <fruggeri@arista.com>,
Jakub Kicinski <kuba@kernel.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Leonard Crestez <cdleonard@gmail.com>,
linux-crypto@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 2/5] tcp/md5: Don't leak ahash in OOM
Date: Fri, 5 Nov 2021 01:49:50 +0000 [thread overview]
Message-ID: <20211105014953.972946-3-dima@arista.com> (raw)
In-Reply-To: <20211105014953.972946-1-dima@arista.com>
In quite unlikely scenario when __tcp_alloc_md5sig_pool() succeeded in
crypto_alloc_ahash(), but later failed to allocate per-cpu request or
scratch area ahash will be leaked.
In theory it can happen multiple times in OOM condition for every
setsockopt(TCP_MD5SIG{,_EXT}).
Add a clean-up path to free ahash.
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
net/ipv4/tcp.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index c0856a6af9f5..eb478028b1ea 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -4276,15 +4276,13 @@ static void __tcp_alloc_md5sig_pool(void)
GFP_KERNEL,
cpu_to_node(cpu));
if (!scratch)
- return;
+ goto out_free;
per_cpu(tcp_md5sig_pool, cpu).scratch = scratch;
}
- if (per_cpu(tcp_md5sig_pool, cpu).md5_req)
- continue;
req = ahash_request_alloc(hash, GFP_KERNEL);
if (!req)
- return;
+ goto out_free;
ahash_request_set_callback(req, 0, NULL, NULL);
@@ -4295,6 +4293,16 @@ static void __tcp_alloc_md5sig_pool(void)
*/
smp_wmb();
tcp_md5sig_pool_populated = true;
+ return;
+
+out_free:
+ for_each_possible_cpu(cpu) {
+ if (per_cpu(tcp_md5sig_pool, cpu).md5_req == NULL)
+ break;
+ ahash_request_free(per_cpu(tcp_md5sig_pool, cpu).md5_req);
+ per_cpu(tcp_md5sig_pool, cpu).md5_req = NULL;
+ }
+ crypto_free_ahash(hash);
}
bool tcp_alloc_md5sig_pool(void)
--
2.33.1
next prev parent reply other threads:[~2021-11-05 1:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 1:49 [PATCH 0/5] tcp/md5: Generic tcp_sig_pool Dmitry Safonov
2021-11-05 1:49 ` [PATCH 1/5] tcp/md5: Don't BUG_ON() failed kmemdup() Dmitry Safonov
2021-11-05 2:55 ` Eric Dumazet
2021-11-05 9:16 ` Leonard Crestez
2021-11-05 13:31 ` Dmitry Safonov
2021-11-05 1:49 ` Dmitry Safonov [this message]
2021-11-05 2:24 ` [PATCH 2/5] tcp/md5: Don't leak ahash in OOM Eric Dumazet
2021-11-05 1:49 ` [PATCH 3/5] tcp/md5: Alloc tcp_md5sig_pool only in setsockopt() Dmitry Safonov
2021-11-05 1:49 ` [PATCH 4/5] tcp/md5: Use tcp_md5sig_pool_* naming scheme Dmitry Safonov
2021-11-05 1:49 ` [PATCH 5/5] tcp/md5: Make more generic tcp_sig_pool Dmitry Safonov
2021-11-05 9:54 ` Leonard Crestez
2021-11-05 13:59 ` Dmitry Safonov
2021-11-05 16:53 ` Leonard Crestez
2021-11-06 3:43 ` Herbert Xu
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=20211105014953.972946-3-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=cdleonard@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=fruggeri@arista.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.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