Merge branch 'ipv6-fixes'

davem330 · davem330 · commit ec7fd009e87c · 2019-02-07T10:48:42.000-08:00
Hangbin Liu says:

====================
fix two kernel panics when disabled IPv6 on boot up

When disabled IPv6 on boot up, since there is no ipv6 route tables, we should
not call rt6_lookup. Fix them by checking if we have inet6_dev pointer on
netdevice.

v2: Fix idev reference leak, declarations and code mixing as Stefano,
    Eric pointed. Since we only want to check if idev exists and not
    reference it, use __in6_dev_get() insteand of in6_dev_get().
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
@@ -1512,9 +1512,13 @@ static void geneve_link_config(struct net_device *dev,
 	}
 #if IS_ENABLED(CONFIG_IPV6)
 	case AF_INET6: {
-		struct rt6_info *rt = rt6_lookup(geneve->net,
-						 &info->key.u.ipv6.dst, NULL, 0,
-						 NULL, 0);
+		struct rt6_info *rt;
+
+		if (!__in6_dev_get(dev))
+			break;
+
+		rt = rt6_lookup(geneve->net, &info->key.u.ipv6.dst, NULL, 0,
+				NULL, 0);
 
 		if (rt && rt->dst.dev)
 			ldev_mtu = rt->dst.dev->mtu - GENEVE_IPV6_HLEN;
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
@@ -546,7 +546,8 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
 	}
 
 	err = 0;
-	if (!ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type, data_len))
+	if (__in6_dev_get(skb->dev) &&
+	    !ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type, data_len))
 		goto out;
 
 	if (t->parms.iph.daddr == 0)

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,8 @@ static int ipip6_err(struct sk_buff *skb, u32 info)`
`546`	`546`	`}`
`547`	`547`
`548`	`548`	`err = 0;`
`549`		`- if (!ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type, data_len))`
	`549`	`+ if (__in6_dev_get(skb->dev) &&`
	`550`	`+ !ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type, data_len))`
`550`	`551`	`goto out;`
`551`	`552`
`552`	`553`	`if (t->parms.iph.daddr == 0)`