moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv6: exthdrs: do not blindly use init_net

Browse Source 
[ Upstream commit bcc3f2a829 ]

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 ?

Fixes: 47d3d7ac65 ("ipv6: Implement limits on Hop-by-Hop and Destination options")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Tom Herbert <tom@quantonium.net>
Cc: Coco Li <lixiaoyan@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet
2021-06-23 08:27:00 -07:00
committed by Greg Kroah-Hartman
parent b559d003f0
commit 2d58a38275
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/exthdrs.c
View File

@@ -306,7 +306,7 @@ fail_and_free:
#endif #endif
if (ip6_parse_tlv(tlvprocdestopt_lst, skb, 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; skb->transport_header += extlen;
opt = IP6CB(skb); opt = IP6CB(skb);
#if IS_ENABLED(CONFIG_IPV6_MIP6) #if IS_ENABLED(CONFIG_IPV6_MIP6)
@@ -1041,7 +1041,7 @@ fail_and_free:
opt->flags |= IP6SKB_HOPBYHOP; opt->flags |= IP6SKB_HOPBYHOP;
if (ip6_parse_tlv(tlvprochopopt_lst, skb, 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; skb->transport_header += extlen;
opt = IP6CB(skb); opt = IP6CB(skb);
opt->nhoff = sizeof(struct ipv6hdr); opt->nhoff = sizeof(struct ipv6hdr);