Commit bcc3f2a8 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: exthdrs: do not blindly use init_net 



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: 47d3d7ac ("ipv6: Implement limits on Hop-by-Hop and Destination options")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Tom Herbert <tom@quantonium.net>
Cc: Coco Li <lixiaoyan@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2ac9800

net/ipv6/exthdrs.c

+2 −2
Original line number Diff line number Diff line
@@ -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);