From: Oliver Crumrine <ozlinuxc@gmail.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: davem@davemloft.n
Subject: [PATCH net-next 04/17] Allocate and free cork in inet6_sk.
Date: Sun, 22 Oct 2023 12:20:23 -0400 [thread overview]
Message-ID: <5e5dcbb87d4b57a347c5146373c75737967e4cd0.1697989543.git.ozlinuxc@gmail.com> (raw)
In-Reply-To: <cover.1697989543.git.ozlinuxc@gmail.com>
Allocate both the inet6_cork and inet_cork_full here, and free the
inet6_cork. (The inet_cork_full is freed in inet_release called at
the last line of inet6_release)
Signed-off-by: Oliver Crumrine <ozlinuxc@gmail.com>
---
net/ipv6/af_inet6.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 368824fe9719..33e92826361f 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -221,6 +221,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
np->mc_all = 1;
np->pmtudisc = IPV6_PMTUDISC_WANT;
np->repflow = net->ipv6.sysctl.flowlabel_reflect & FLOWLABEL_REFLECT_ESTABLISHED;
+ np->cork = kzalloc(sizeof(struct inet6_cork), GFP_KERNEL);
sk->sk_ipv6only = net->ipv6.sysctl.bindv6only;
sk->sk_txrehash = READ_ONCE(net->core.sysctl_txrehash);
@@ -234,6 +235,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
inet->mc_index = 0;
RCU_INIT_POINTER(inet->mc_list, NULL);
inet->rcv_tos = 0;
+ inet->cork = kzalloc(sizeof(struct inet_cork_full), GFP_KERNEL);
if (READ_ONCE(net->ipv4.sysctl_ip_no_pmtu_disc))
inet->pmtudisc = IP_PMTUDISC_DONT;
@@ -481,6 +483,9 @@ int inet6_release(struct socket *sock)
/* Free ac lists */
ipv6_sock_ac_close(sk);
+ /* Free cork */
+ kfree(inet6_sk(sk)->cork);
+
return inet_release(sock);
}
EXPORT_SYMBOL(inet6_release);
--
2.42.0
next prev parent reply other threads:[~2023-10-22 16:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-22 16:19 [PATCH net-next 00/17] Change cork to a pointer in sockets Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 01/17] Make cork in inet_sock a pointer Oliver Crumrine
2023-10-23 7:05 ` Ravi Gunasekaran
2023-10-22 16:20 ` [PATCH net-next 02/17] Allocate and free cork for ipv4 and ipv6 Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 03/17] Change cork in ipv6_pinfo to a pointer Oliver Crumrine
2023-10-22 16:20 ` Oliver Crumrine [this message]
2023-10-22 16:20 ` [PATCH net-next 05/17] Change occurence of cork to pointer Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 06/17] Update code for cork as a pointer Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 07/17] Change occurences of cork to pointer Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 08/17] Update " Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 09/17] Change instances of cork to a pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 11/17] Update occurences of cork to pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 12/17] Change an occurence " Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 13/17] Change some instances of cork to a pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 14/17] Update usages " Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 15/17] Modify occurences of cork to make it " Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 16/17] Change a usage of cork to pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 17/17] Change the last instance " Oliver Crumrine
2023-10-23 8:24 ` [PATCH net-next 00/17] Change cork to a pointer in sockets Paolo Abeni
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=5e5dcbb87d4b57a347c5146373c75737967e4cd0.1697989543.git.ozlinuxc@gmail.com \
--to=ozlinuxc@gmail.com \
--cc=davem@davemloft.n \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).