ipv6: exthdrs: do not blindly use init_net
Subsystems (3)
PATCH 1/1 ipv6: exthdrs: do not blindly use init_net
From: Eric Dumazet <[email protected]>
I see no reason why max_dst_opts_cnt and max_hbh_opts_cnt are fetched from the initial net namespace.
The other sysctls (max_dst_opts_len & max_hbh_opts_len) are in fact already using the current ns.
Note: it is not clear why ipv6_destopt_rcv() use two ways to get to the netns :
1) dev_net(dst->dev)
Originally used to increment IPSTATS_MIB_INHDRERRORS
2) dev_net(skb->dev)
Tom used this variant in his patch.
Maybe this calls to use ipv6_skb_net() instead ?
--- net/ipv6/exthdrs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/exthdrs.c +2 -2
@@ -306,7 +306,7 @@ static int ipv6_destopt_rcv(struct sk_buff *skb)#endif if (ip6_parse_tlv (tlvprocdestopt_lst, skb, - init_net.ipv6.sysctl.max_dst_opts_cnt)) { + net->ipv6.sysctl.max_dst_opts_cnt)) { skb->transport_header += extlen; opt =IP6CB (skb);#if IS_ENABLED (CONFIG_IPV6_MIP6 )
@@ -1037,7 +1037,7 @@ int ipv6_parse_hopopts(struct sk_buff *skb) opt->flags |=IP6SKB_HOPBYHOP ;if (ip6_parse_tlv (tlvprochopopt_lst, skb, - init_net.ipv6.sysctl.max_hbh_opts_cnt)) { + net->ipv6.sysctl.max_hbh_opts_cnt)) { skb->transport_header += extlen; opt =IP6CB (skb); opt->nhoff =sizeof (struct ipv6hdr );
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Wed, 23 Jun 2021 08:27:00 -0700 you wrote:
From: Eric Dumazet <[email protected]>
I see no reason why
max_dst_opts_cntandmax_hbh_opts_cntare fetched from the initial net namespace.The other sysctls (
max_dst_opts_len&max_hbh_opts_len) are in fact already using the current ns.[...]
Here is the summary with links:
- [net] ipv6: exthdrs: do not blindly use init_net
https://git.kernel.org/netdev/net/c/bcc3f2a829b9
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html